[Mesa-dev] [PATCH] i965: bump libdrm requirement to 2.4.61 and drop in-tree workaround

[Samuel Iglesias Gonsálvez]

On 08/07/15 18:57, Emil Velikov wrote:
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>  configure.ac                             | 2 +-
>  src/mesa/drivers/dri/i965/intel_screen.c | 5 -----
>  2 files changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d819bef..eb7180b 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 c0f5c92..fd343ee 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)
>  {
> 

Reviewed-by: Samuel Iglesias Gonsálvez <siglesias at igalia.com>

Sam