diff options
| author | Paulo Zanoni <paulo.r.zanoni@> | 2015-07-14 12:45:04 -0300 |
|---|---|---|
| committer | Paulo Zanoni <paulo.r.zanoni@intel.com> | 2015-07-14 12:52:09 -0300 |
| commit | 4deb562659edc1b4d53024b6ef6e183b4f94f768 (patch) | |
| tree | c465129503644052a375c30afe710beee2462864 | |
| parent | 19e4632407cfe9fdfe5e067dfaaeaef4d5bf669f (diff) | |
configure: require libdrm >= 2.4.55
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@>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/igt_kms.c | 12 | ||||
| -rw-r--r-- | tests/pm_rpm.c | 3 |
3 files changed, 1 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 77b595b6..f3603c17 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ if test "x$GCC" = "xyes"; then fi 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(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) diff --git a/lib/igt_kms.c b/lib/igt_kms.c index 203a3fbd..0bb16b4e 100644 --- a/lib/igt_kms.c +++ b/lib/igt_kms.c @@ -49,18 +49,6 @@ #include "intel_chipset.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 */ #define MAX_CONNECTORS 32 static char *forced_connectors[MAX_CONNECTORS + 1]; diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c index eafbb564..d509fa83 100644 --- a/tests/pm_rpm.c +++ b/tests/pm_rpm.c @@ -51,9 +51,6 @@ #include "igt_kms.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_PC9_RES 0x631 #define MSR_PC10_RES 0x632 |