Allow X server to build against libdrm 2.1

configure.ac

@@ -619,6 +619,9 @@ if test "x$DRI" = xyes; then
 	PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
 	PKG_CHECK_MODULES([LIBDRM], [libdrm])
 	PKG_CHECK_MODULES([GL], [glproto >= 1.4.1])
+	PKG_CHECK_EXISTS(libdrm >= 2.2.0,
+			 [AC_DEFINE([HAVE_LIBDRM_2_2], 1,
+			 [Has version 2.2 (or newer) of the drm library])])
 	AC_SUBST(DRIPROTO_CFLAGS)
 	AC_SUBST(LIBDRM_CFLAGS)
 	AC_SUBST(GL_CFLAGS)

hw/xfree86/os-support/drm/xf86drm.c

@@ -2307,6 +2307,7 @@ int drmRemoveSIGIOHandler(int fd)
     return xf86RemoveSIGIOHandler(fd);
 }
 
+#if HAVE_LIBDRM_2_2
 /*
  * Valid flags are 
  * DRM_FENCE_FLAG_EMIT
@@ -3260,3 +3261,4 @@ int drmMMUnlock(int fd, unsigned memType)
     
     return ret;	
 }
+#endif /* HAVE_LIBDRM_2_2 */

hw/xfree86/os-support/xf86drm.h

@@ -36,7 +36,9 @@
 #define _XF86DRM_H_
 
 #include <drm.h>
+#if HAVE_LIBDRM_2_2
 #include <xf86mm.h>
+#endif
 
 				/* Defaults, if nothing set in xf86config */
 #define DRM_DEV_UID	 0

include/dix-config.h.in

@@ -127,6 +127,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have version 2.2 (or newer) of the drm library */
+#undef HAVE_LIBDRM_2_2
+
 /* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM