From 1de259a7916c44a09591a11f6b751e3e99c3d626 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Sep 10 2012 06:03:53 +0000
Subject: fix race across GPU power down and server startup


---

diff --git a/0001-scan-pci-after-probing-devices.patch b/0001-scan-pci-after-probing-devices.patch
new file mode 100644
index 0000000..f895e46
--- /dev/null
+++ b/0001-scan-pci-after-probing-devices.patch
@@ -0,0 +1,30 @@
+From a26837d20ea626943398f2390bfd00c22be3468b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@dhcp-40-90.bne.redhat.com>
+Date: Mon, 10 Sep 2012 12:02:55 +1000
+Subject: [PATCH] scan pci after probing devices
+
+---
+ hw/xfree86/common/xf86platformBus.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
+index 502d3c4..5e05791 100644
+--- a/hw/xfree86/common/xf86platformBus.c
++++ b/hw/xfree86/common/xf86platformBus.c
+@@ -213,11 +213,12 @@ xf86platformProbe(void)
+     int i;
+     Bool pci = TRUE;
+ 
++    config_odev_probe(&xf86PlatformDeviceProbe);
++
+     if (!xf86scanpci()) {
+         pci = FALSE;
+     }
+ 
+-    config_odev_probe(&xf86PlatformDeviceProbe);
+     for (i = 0; i < xf86_num_platform_devices; i++) {
+         char *busid = xf86_get_platform_attrib(i, ODEV_ATTRIB_BUSID);
+ 
+-- 
+1.7.12
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 5477e01..bf76be0 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -43,7 +43,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.13.0
-Release:   2%{?gitdate:.%{gitdate}}%{dist}
+Release:   3%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -111,6 +111,8 @@ Patch7051: 0001-dri2-invalidate-drawable-after-sharing-pixmap.patch
 
 Patch7052: 0001-xf86-return-NULL-for-compat-output-if-no-outputs.patch
 
+Patch7053: 0001-scan-pci-after-probing-devices.patch
+
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
 %global sdkdir		%{_includedir}/xorg
@@ -583,6 +585,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Sep 10 2012 Dave Airlie <airlied@redhat.com> 1.13.0-3
+- fix race across GPU power down and server startup
+
 * Mon Sep 10 2012 Dave Airlie <airlied@redhat.com> 1.13.0-2
 - fix compat output segfault on output less gpus.