diff options
| author | Emil Velikov <[email protected]> | 2015-07-06 09:42:01 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-07-13 20:14:31 +0100 |
| commit | a025e539e430b7bbfae9b786bd79d0d608f1acf8 (patch) | |
| tree | 0fb7f3a87de2804e0454b2046905e7dbaa27f8e8 | |
| parent | c505064b2cea14c9da115a26e9326b9c0c7dca3b (diff) | |
i965: bump libdrm requirement to 2.4.61 and drop in-tree workaround
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Samuel Iglesias Gonsálvez <[email protected]>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/intel_screen.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 11ce0e53d0c..bdfd13417e0 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,7 @@ AC_SUBST([OSMESA_VERSION]) dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.38 LIBDRM_RADEON_REQUIRED=2.4.56 -LIBDRM_INTEL_REQUIRED=2.4.60 +LIBDRM_INTEL_REQUIRED=2.4.61 LIBDRM_NVVIEUX_REQUIRED=2.4.33 LIBDRM_NOUVEAU_REQUIRED=2.4.62 LIBDRM_FREEDRENO_REQUIRED=2.4.57 diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index c0f5c927ed8..fd343eeb4e1 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -1330,11 +1330,6 @@ set_max_gl_versions(struct intel_screen *screen) } } -/* drop when libdrm 2.4.61 is released */ -#ifndef I915_PARAM_REVISION -#define I915_PARAM_REVISION 32 -#endif - static int brw_get_revision(int fd) { |