DRI3-by-default-for-Ubuntu-14.04.patch

From 48be3a42c0a53be43dd125a7eb9e234de36e945d Mon Sep 17 00:00:00 2001
From: Chia-I Wu <[email protected]>
Date: Fri, 4 Dec 2015 11:29:50 +0800
Subject: [PATCH] DRI3 by default for Ubuntu 14.04

---
 configure.ac           | 2 +-
 src/sna/sna_driver.c   | 4 ++--
 src/uxa/intel_driver.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9aa7d97..2411e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,7 +356,7 @@ AC_ARG_WITH(default-dri,
 	    AS_HELP_STRING([--with-default-dri],
 			   [Select the default maximum DRI level [default 2]]),
 	      [DRI_DEFAULT=$withval],
-	      [DRI_DEFAULT=2])
+	      [DRI_DEFAULT=3])
 if test "x$DRI_DEFAULT" = "x0"; then
 	AC_DEFINE(DEFAULT_DRI_LEVEL, 0,[Default DRI level])
 else
diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
index 14ec2f6..a9fc6ec 100644
--- a/src/sna/sna_driver.c
+++ b/src/sna/sna_driver.c
@@ -438,7 +438,7 @@ static void setup_dri(struct sna *sna)
 	level = intel_option_cast_to_unsigned(sna->Options, OPTION_DRI, DEFAULT_DRI_LEVEL);
 #if HAVE_DRI3
 	if (level >= 3)
-		sna->dri3.available = !!xf86LoadSubModule(sna->scrn, "dri3");
+		sna->dri3.available = true;
 #endif
 #if HAVE_DRI2
 	if (level >= 2)
@@ -663,7 +663,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int probe)
 	sna->present.available = false;
 	if (xf86ReturnOptValBool(sna->Options, OPTION_PRESENT, TRUE)) {
 #if HAVE_PRESENT
-		sna->present.available = !!xf86LoadSubModule(scrn, "present");
+		sna->present.available = true;
 #endif
 	}
 
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index 8f76b34..89344ec 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -608,7 +608,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags)
 		intel->dri2 = DRI_DISABLED;
 #endif
 #if HAVE_DRI3
-	if (intel->dri3 != DRI_DISABLED && !xf86LoadSubModule(scrn, "dri3"))
+	if (intel->dri3 != DRI_DISABLED && false)
 		intel->dri3 = DRI_DISABLED;
 #endif
 
-- 
2.6.0.rc2.230.g3dd15c0