[xorg-x11-server] xserver-1.12-modesetting-fallback.patch: add modesetting to fallback list

[Dave Airlie]

commit f541db1f8ed361ea2256ee32c43174de4eaeb5b0
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri May 25 14:04:14 2012 +0100

    xserver-1.12-modesetting-fallback.patch: add modesetting to fallback list

 xorg-x11-server.spec                    |    3 ++
 xserver-1.12-modesetting-fallback.patch |   32 +++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index c769c9b..0cbb42f 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -104,6 +104,8 @@ Patch7014: xserver-1.12-os-make-timers-signal-safe.patch
 
 # backport pci slot claiming fix for kms drivers
 Patch7015: xserver-fix-pci-slot-claims.patch
+# backport modesetting fallback driver
+Patch7016: xserver-1.12-modesetting-fallback.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -576,6 +578,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Fri May 25 2012 Dave Airlie <airlied at redhat.com> 1.12.1-2
 - xserver-fix-pci-slot-claims.patch: backport slot claiming fix from master
+- xserver-1.12-modesetting-fallback.patch: add modesetting to fallback list
 
 * Mon May 14 2012 Peter Hutterer <peter.hutterer at redhat.com>
 - Drop xserver-1.10.99.1-test.patch:
diff --git a/xserver-1.12-modesetting-fallback.patch b/xserver-1.12-modesetting-fallback.patch
new file mode 100644
index 0000000..2808d9f
--- /dev/null
+++ b/xserver-1.12-modesetting-fallback.patch
@@ -0,0 +1,32 @@
+From a2a02882ab65133e6c0c69db1f38bc20b406236f Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at redhat.com>
+Date: Sun, 6 May 2012 17:35:34 +0100
+Subject: [PATCH] xfree86: add modesetting driver to fallback list on Linux
+
+Add the modesetting driver to the fallback list on Linux, after vesa
+before fbdev.
+
+Acked-by: Peter Hutterer <peter.hutterer at who-t.net>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ hw/xfree86/common/xf86AutoConfig.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 43c746b..d0eb0af 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+@@ -270,6 +270,10 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
+ #endif
+     }
+ 
++#if defined(__linux__)
++    matches[i++] = xnfstrdup("modesetting");
++#endif
++
+ #if !defined(sun)
+     /* Fallback to platform default frame buffer driver */
+     if (i < (nmatches - 1)) {
+-- 
+1.7.7.6
+