[xorg-x11-drv-qxl/f20] possibly fix F20 blocker with oops in the kernel (#1027831)

[Dave Airlie]

commit a79feadb56554bb3c06ab14e328207381832ecba
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Nov 8 13:54:05 2013 +1000

    possibly fix F20 blocker with oops in the kernel (#1027831)

 no-surfaces-kms.patch |   12 ++++++++++++
 xorg-x11-drv-qxl.spec |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/no-surfaces-kms.patch b/no-surfaces-kms.patch
new file mode 100644
index 0000000..21c53ab
--- /dev/null
+++ b/no-surfaces-kms.patch
@@ -0,0 +1,12 @@
+diff -up xf86-video-qxl-0.1.1/src/qxl_uxa.c.dma xf86-video-qxl-0.1.1/src/qxl_uxa.c
+--- xf86-video-qxl-0.1.1/src/qxl_uxa.c.dma	2013-11-08 13:37:49.898702515 +1000
++++ xf86-video-qxl-0.1.1/src/qxl_uxa.c	2013-11-08 13:38:10.185702515 +1000
+@@ -422,6 +422,8 @@ qxl_create_pixmap (ScreenPtr screen, int
+     ErrorF ("Create pixmap: %d %d @ %d (usage: %d)\n", w, h, depth, usage);
+ #endif
+ 
++    if (qxl->kms_enabled)
++	goto fallback;
+     if (uxa_swapped_out (screen))
+ 	goto fallback;
+ 
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index 20cdcc4..83c221d 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -22,7 +22,7 @@ Name:      xorg-x11-drv-qxl
 
 Version:   0.1.1
 
-Release:   1%{?gver}%{?dist}
+Release:   2%{?gver}%{?dist}
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 
@@ -32,6 +32,9 @@ Patch1:    qxl-kms-disable-composite.patch
 # This should go away with a spice server containing 1d18b7e98ab268c755933061d77ccc7a981815e2
 Patch2:        0005-spiceqxl_display-only-use-qxl-interface-after-it-is-.patch
 
+# fix a blocker in F20 the quick way.
+Patch3: no-surfaces-kms.patch
+
 # Fixes for running with Xorg suid, which is the only way we ship in fedora
 Patch6: 0006-spiceqxl_spice_server-no-need-to-call-spice_server_s.patch
 Patch7: 0007-xspice-chown-both-files-used-by-vdagent-for-suid-Xor.patch
@@ -84,6 +87,7 @@ XSpice is both an X and a Spice server.
 
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
@@ -139,6 +143,9 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/spiceqxl.xorg.conf
 
 
 %changelog
+* Fri Nov 08 2013 Dave Airlie <airlied at redhat.com> 0.1.1-2
+- possibly fix F20 blocker with oops in the kernel (#1027831)
+
 * Mon Oct 21 2013 Alon Levy <alevy at redhat.com> - 0.1.1-1
 - New upstream release
 - Fixes to said release to work with suid issues (upstream)