xf86-video-intel: 3 commits - configure.ac src/intel_options.c src/intel_options.h src/sna/sna_driver.c

[Chris Wilson]

 configure.ac         |   10 ++++++++++
 src/intel_options.c  |    1 -
 src/intel_options.h  |   20 +++++++++-----------
 src/sna/sna_driver.c |    8 --------
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 7614a541886dd9eb5c9d441e2618785e9cc53a65
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Jun 10 09:36:38 2012 +0100

    configure: Harden --with-default-accel against simple mistakes
    
    If the user specifies no options, assume automatic selection. Then
    double check we found a valid backend and so avoid later breaking the
    build.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/configure.ac b/configure.ac
index cb740a7..79df7e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -163,6 +163,10 @@ AC_ARG_WITH(default-accel,
 			   [Select the default acceleration method [default=sna if enabled, otherwise uxa]]),
 			   [accel="$withval"],
 			   [accel=auto])
+if test "x$accel" = xyes; then
+	AC_MSG_WARN([No default acceleration specified, choosing automatic selection])
+	accel="auto"
+fi
 
 AC_MSG_CHECKING([which acceleration method to use by default])
 if test "x$accel" = xauto; then
@@ -178,9 +182,11 @@ if test "x$accel" = xauto; then
 	fi
 fi
 
+have_accel=no
 if test "x$accel" = xsna; then
 	if test "x$SNA" != "xno"; then
 		AC_DEFINE(DEFAULT_ACCEL_METHOD, SNA, [Default acceleration method])
+		have_accel=yes
 	else
 		AC_MSG_ERROR([SNA requested as default, but is not enabled])
 	fi
@@ -189,11 +195,15 @@ fi
 if test "x$accel" = xuxa; then
 	if test "x$UXA" != "xno"; then
 		AC_DEFINE(DEFAULT_ACCEL_METHOD, UXA, [Default acceleration method])
+		have_accel=yes
 	else
 		AC_MSG_ERROR([UXA requested as default, but is not enabled])
 	fi
 fi
 AC_MSG_RESULT($accel)
+if test "x$accel" = xno; then
+	AC_MSG_ERROR([No default acceleration option])
+fi
 
 AC_ARG_ENABLE(vmap,
 	      AS_HELP_STRING([--enable-vmap],
commit ea0209fbc12fca282bd8ef72223791bf163801ce
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 8 22:44:23 2012 +0100

    sna: Remove option to disable vmap
    
    It works everywhere, so when it is finally enabled, let it be.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_options.c b/src/intel_options.c
index 56f1ae9..78575a6 100644
--- a/src/intel_options.c
+++ b/src/intel_options.c
@@ -20,7 +20,6 @@ const OptionInfoRec intel_options[] = {
 #endif
 #ifdef USE_SNA
 	{OPTION_THROTTLE,	"Throttle",	OPTV_BOOLEAN,	{0},	1},
-	{OPTION_VMAP,	"UseVmap",	OPTV_BOOLEAN,	{0},	1},
 	{OPTION_ZAPHOD,	"ZaphodHeads",	OPTV_STRING,	{0},	0},
 	{OPTION_DELAYED_FLUSH,	"DelayedFlush",	OPTV_BOOLEAN,	{0},	1},
 #endif
diff --git a/src/intel_options.h b/src/intel_options.h
index ba2fc4b..05a2ad1 100644
--- a/src/intel_options.h
+++ b/src/intel_options.h
@@ -26,7 +26,6 @@ enum intel_options {
 #endif
 #ifdef USE_SNA
 	OPTION_THROTTLE,
-	OPTION_VMAP,
 	OPTION_ZAPHOD,
 	OPTION_DELAYED_FLUSH,
 #endif
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 8da4f52..32b96e1 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -501,14 +501,6 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags)
 			   "Disabling use of relaxed fencing\n");
 		sna->kgem.has_relaxed_fencing = 0;
 	}
-	if (!xf86ReturnOptValBool(sna->Options,
-				  OPTION_VMAP,
-				  sna->kgem.has_vmap)) {
-		xf86DrvMsg(scrn->scrnIndex,
-			   sna->kgem.has_vmap ? X_CONFIG : X_PROBED,
-			   "Disabling use of vmap\n");
-		sna->kgem.has_vmap = 0;
-	}
 
 	/* Enable tiling by default */
 	sna->tiling = SNA_TILING_ALL;
commit 18baa1428b1c4c0a49927d4c32db091db9e4e97b
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jun 8 22:43:01 2012 +0100

    Make the enum list of options consistent with the actual table.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/intel_options.h b/src/intel_options.h
index 42a9e56..ba2fc4b 100644
--- a/src/intel_options.h
+++ b/src/intel_options.h
@@ -15,21 +15,15 @@ enum intel_options {
 	OPTION_DRI,
 	OPTION_VIDEO_KEY,
 	OPTION_COLOR_KEY,
-	OPTION_TILING_FB,
 	OPTION_TILING_2D,
-	OPTION_SHADOW,
+	OPTION_TILING_FB,
 	OPTION_SWAPBUFFERS_WAIT,
-	OPTION_TRIPLE_BUFFER,
-#ifdef INTEL_XVMC
-	OPTION_XVMC,
-#endif
 	OPTION_PREFER_OVERLAY,
-	OPTION_DEBUG_FLUSH_BATCHES,
-	OPTION_DEBUG_FLUSH_CACHES,
-	OPTION_DEBUG_WAIT,
 	OPTION_HOTPLUG,
 	OPTION_RELAXED_FENCING,
-	OPTION_USE_SNA,
+#ifdef INTEL_XVMC
+	OPTION_XVMC,
+#endif
 #ifdef USE_SNA
 	OPTION_THROTTLE,
 	OPTION_VMAP,
@@ -38,7 +32,12 @@ enum intel_options {
 #endif
 #ifdef USE_UXA
 	OPTION_FALLBACKDEBUG,
+	OPTION_DEBUG_FLUSH_BATCHES,
+	OPTION_DEBUG_FLUSH_CACHES,
+	OPTION_DEBUG_WAIT,
 	OPTION_BUFFER_CACHE,
+	OPTION_SHADOW,
+	OPTION_TRIPLE_BUFFER,
 #endif
 	NUM_OPTIONS,
 };