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

[Chris Wilson]

 configure.ac   |    9 ---------
 src/sna/kgem.c |    5 -----
 2 files changed, 14 deletions(-)

New commits:
commit 8238c672984e31ae655353d6412e3395a9cdfbe6
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Oct 17 22:16:29 2012 +0100

    sna: secure batches accepted upstream, so simply use runtime detection
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index ab3f3d2..972d918 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,15 +292,6 @@ if test "x$USERPTR" = xyes; then
 	AC_DEFINE(USE_USERPTR,1,[Assume USERPTR support])
 fi
 
-AC_ARG_ENABLE(secure-batches,
-	      AS_HELP_STRING([--enable-secure-batches],
-			     [Enable use of secure batches (experimental) [default=no]]),
-	      [SECURE_BATCHES="$enableval"],
-	      [SECURE_BATCHES=no])
-if test "x$SECURE_BATCHES" = xyes; then
-	AC_DEFINE(USE_SECURE_BATCHES,1,[Test for kernel support of secure batches])
-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 ae76a39..266839c 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -72,11 +72,6 @@ search_snoop_cache(struct kgem *kgem, unsigned int num_pages, unsigned flags);
 #define DBG_NO_SECURE_BATCHES 0
 #define DBG_DUMP 0
 
-#ifndef USE_SECURE_BATCHES
-#undef DBG_NO_SECURE_BATCHES
-#define DBG_NO_SECURE_BATCHES 1
-#endif
-
 #define SHOW_BATCH 0
 
 /* Worst case seems to be 965gm where we cannot write within a cacheline that