From 3551519597ae587ef945e1852d4091dbaa0cc91b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Apr 15 2009 08:42:38 +0000
Subject: * Wed Apr 15 2009 Dave Airlie <airlied@redhat.com> 1.6.1-2

- xserver-1.6.0-randr-xinerama-crash.patch - fix xinerama vs randr crash

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 3f0b15d..cad73ce 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -103,6 +103,8 @@ Patch6027: xserver-1.6.0-displayfd.patch
 Patch6028: xserver-1.6.0-restore-zap.patch
 Patch6029: xserver-1.6.0-no-i810.patch
 
+Patch6030: xserver-1.6.0-randr-xinerama-crash.patch
+
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
 %define sdkdir		%{_includedir}/xorg
@@ -533,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 15 2009 Dave Airlie <airlied@redhat.com> 1.6.1-2
+- xserver-1.6.0-randr-xinerama-crash.patch - fix xinerama vs randr crash
+
 * Tue Apr 14 2009 Adam Jackson <ajax@redhat.com> 1.6.1-1
 - xserver 1.6.1
 
diff --git a/xserver-1.6.0-randr-xinerama-crash.patch b/xserver-1.6.0-randr-xinerama-crash.patch
new file mode 100644
index 0000000..be033b6
--- /dev/null
+++ b/xserver-1.6.0-randr-xinerama-crash.patch
@@ -0,0 +1,38 @@
+From be710aa311f385827f7d4ac1773971d575353d3b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@linux.ie>
+Date: Wed, 15 Apr 2009 18:26:06 +1000
+Subject: [PATCH] randr12: looking up these bits if randr isn't initialised is bad.
+
+With xinerama enabled I get a segfault in here, this might not
+be the right answer.
+---
+ hw/xfree86/modes/xf86RandR12.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
+index dacb5d2..ac066a8 100644
+--- a/hw/xfree86/modes/xf86RandR12.c
++++ b/hw/xfree86/modes/xf86RandR12.c
+@@ -754,8 +754,8 @@ Bool
+ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+ {
+     ScrnInfoPtr		pScrn = xf86Screens[pScreen->myNum];
+-    xf86CrtcConfigPtr   config = XF86_CRTC_CONFIG_PTR(pScrn);
+-    XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);
++    xf86CrtcConfigPtr   config;
++    XF86RandRInfoPtr	randrp;
+     int			c;
+     int			width, height;
+     int			mmWidth, mmHeight;
+@@ -765,6 +765,8 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
+ 	return TRUE;
+ #endif
+ 
++    config = XF86_CRTC_CONFIG_PTR(pScrn);
++    randrp = XF86RANDRINFO(pScreen);
+     /*
+      * Compute size of screen
+      */
+-- 
+1.6.0.6
+