From 95b5d8507992cde2b88eeaf29c35743d4b70cb69 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@fedoraproject.org>
Date: Mar 13 2008 06:37:36 +0000
Subject: * Thu Mar 13 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-6.20080310

- fix fbdev probing with no hardware to not load fbdev if pci slot claimed

---

diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 7f096ed..31a3ec2 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -20,7 +20,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.4.99.901
-Release:   5.%{gitdate}%{?dist}
+Release:   6.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -64,6 +64,7 @@ Patch5003: xserver-1.5.0-x86emu.patch
 Patch5004: xserver-1.5.0-wfs.patch
 Patch5005: xserver-1.5.0-unselinux.patch
 Patch5006: xserver-1.5.0-ia64.patch
+Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -512,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Mar 13 2008 Dave Airlie <airlied@redhat.com> 1.4.99.901-6.20080310
+- fix fbdev probing with no hardware to not load fbdev if pci slot claimed
+
 * Wed Mar 12 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-5.20080310
 - xserver-1.5.0-unselinux.patch: Disable selinux extension for now.
 - xserver-1.5.0-ia64.patch: Fix ia64 PCI support. (#429878)
diff --git a/xserver-1.5.0-bad-fbdev-thats-mine.patch b/xserver-1.5.0-bad-fbdev-thats-mine.patch
new file mode 100644
index 0000000..65e6fd3
--- /dev/null
+++ b/xserver-1.5.0-bad-fbdev-thats-mine.patch
@@ -0,0 +1,42 @@
+From 656ca314bb97341a07d4bbd7fcfe7af9a3689761 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@panoply-rh.(none)>
+Date: Thu, 13 Mar 2008 16:16:46 +1000
+Subject: [PATCH] fbdev: make entity fail if PCI claimed already.
+
+bad kitty fbdev.
+---
+ hw/xfree86/common/xf86Bus.c   |    3 +++
+ hw/xfree86/common/xf86fbBus.c |    3 +++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
+index f7ffac8..9f4e0ca 100644
+--- a/hw/xfree86/common/xf86Bus.c
++++ b/hw/xfree86/common/xf86Bus.c
+@@ -458,6 +458,9 @@ xf86GetEntityInfo(int entityIndex)
+     EntityInfoPtr pEnt;
+     int i;
+     
++    if (entityIndex == -1)
++	return NULL;
++
+     if (entityIndex >= xf86NumEntities)
+ 	return NULL;
+     
+diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c
+index 102f6b1..48e101b 100644
+--- a/hw/xfree86/common/xf86fbBus.c
++++ b/hw/xfree86/common/xf86fbBus.c
+@@ -58,6 +58,9 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
+ {
+     EntityPtr p;
+     int num;
++
++    if (pciSlotClaimed)
++	return -1;
+     
+     num = xf86AllocateEntity();
+     p = xf86Entities[num];
+-- 
+1.5.4.3
+