xf86-video-intel: configure.ac src/sna/kgem.c

[Chris Wilson]

 configure.ac   |   11 -----------
 src/sna/kgem.c |    8 ++------
 2 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit df297e9fafe1a7de1036f3151f93de67661c2a4e
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri May 16 18:20:06 2014 +0100

    sna: Userptr lands upstream, enable.
    
    No longer an optional feature of an experimental kernel!
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index 99d383a..f9f3836 100644
--- a/configure.ac
+++ b/configure.ac
@@ -640,17 +640,6 @@ if test "x$ROTATION" = "xyes"; then
 	xp_msg="$xp_msg rotation"
 fi
 
-AC_ARG_ENABLE(userptr,
-	      AS_HELP_STRING([--enable-userptr],
-			     [Enable use of userptr (experimental) [default=no]]),
-	      [USERPTR="$enableval"],
-	      [USERPTR="no"])
-AM_CONDITIONAL(USE_USERPTR, test "x$USERPTR" = "xyes")
-if test "x$USERPTR" = "xyes"; then
-	AC_DEFINE(USE_USERPTR,1,[Assume "userptr" support])
-	xp_msg="$xp_msg userptr"
-fi
-
 AC_ARG_ENABLE(async-swap,
 	      AS_HELP_STRING([--enable-async-swap],
 			     [Enable use of asynchronous swaps (experimental) [default=no]]),
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index a042ca6..7e906e8 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -133,7 +133,7 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
 #define LOCAL_I915_EXEC_NO_RELOC		(1<<11)
 #define LOCAL_I915_EXEC_HANDLE_LUT		(1<<12)
 
-#define LOCAL_I915_GEM_CREATE2       0x33
+#define LOCAL_I915_GEM_CREATE2       0x34
 #define LOCAL_IOCTL_I915_GEM_CREATE2 DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_CREATE2, struct local_i915_gem_create2)
 struct local_i915_gem_create2 {
 	uint64_t size;
@@ -149,7 +149,7 @@ struct local_i915_gem_create2 {
 	uint32_t handle;
 };
 
-#define LOCAL_I915_GEM_USERPTR       0x34
+#define LOCAL_I915_GEM_USERPTR       0x33
 #define LOCAL_IOCTL_I915_GEM_USERPTR DRM_IOWR (DRM_COMMAND_BASE + LOCAL_I915_GEM_USERPTR, struct local_i915_gem_userptr)
 struct local_i915_gem_userptr {
 	uint64_t user_ptr;
@@ -1034,7 +1034,6 @@ static bool test_has_caching(struct kgem *kgem)
 
 static bool test_has_userptr(struct kgem *kgem)
 {
-#if defined(USE_USERPTR)
 	uint32_t handle;
 	void *ptr;
 
@@ -1053,9 +1052,6 @@ static bool test_has_userptr(struct kgem *kgem)
 	free(ptr);
 
 	return handle != 0;
-#else
-	return false;
-#endif
 }
 
 static bool test_has_create2(struct kgem *kgem)