flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-28 10:16:12 +00:00
Code Issues Releases Wiki Activity

configure: require libdrm >= 2.4.55

Browse Source 
And drop the now unnecessary universal plane definitions. The 2.4.55
version is already quite old, so we should be fine.

Thanks to Thomas Wood for quickly spotting this.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@>
This commit is contained in:
Paulo Zanoni 2015-07-14 12:45:04 -03:00 committed by Paulo Zanoni
parent 19e4632407
commit 4deb562659
3 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -85,7 +85,7 @@ if test "x$GCC" = "xyes"; then
fi fi
AC_SUBST(ASSEMBLER_WARN_CFLAGS) AC_SUBST(ASSEMBLER_WARN_CFLAGS)
PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.52 libdrm]) PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.55 libdrm])
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no) PKG_CHECK_MODULES(OVERLAY_XVLIB, [xv x11 xext dri2proto >= 2.6], enable_overlay_xvlib=yes, enable_overlay_xvlib=no)
PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no) PKG_CHECK_MODULES(OVERLAY_XLIB, [cairo-xlib dri2proto >= 2.6], enable_overlay_xlib=yes, enable_overlay_xlib=no)

12
lib/igt_kms.c
View File

@ -49,18 +49,6 @@
#include "intel_chipset.h" #include "intel_chipset.h"
#include "igt_debugfs.h" #include "igt_debugfs.h"
/*
* There hasn't been a release of libdrm containing these #define's yet, so
* copy them here to allow compilation to succeed in the mean time.
*
* We can drop these #define's and just make i-g-t depend on the proper libdrm
* version in the future.
*/
#define DRM_CLIENT_CAP_UNIVERSAL_PLANES 2
#define DRM_PLANE_TYPE_OVERLAY 0
#define DRM_PLANE_TYPE_PRIMARY 1
#define DRM_PLANE_TYPE_CURSOR 2
/* list of connectors that need resetting on exit */ /* list of connectors that need resetting on exit */
#define MAX_CONNECTORS 32 #define MAX_CONNECTORS 32
static char *forced_connectors[MAX_CONNECTORS + 1]; static char *forced_connectors[MAX_CONNECTORS + 1];

3
tests/pm_rpm.c
View File

@ -51,9 +51,6 @@
#include "igt_kms.h" #include "igt_kms.h"
#include "igt_gt.h" #include "igt_gt.h"
/* One day, this will be on your libdrm. */
#define DRM_CLIENT_CAP_UNIVERSAL_PLANES 2
#define MSR_PC8_RES 0x630 #define MSR_PC8_RES 0x630
#define MSR_PC9_RES 0x631 #define MSR_PC9_RES 0x631
#define MSR_PC10_RES 0x632 #define MSR_PC10_RES 0x632