rpms/xorg-x11-server/devel xserver-1.5.0-bad-fbdev-thats-mine.patch, NONE, 1.1 xorg-x11-server.spec, 1.307, 1.308

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12012

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.5.0-bad-fbdev-thats-mine.patch 
Log Message:
* Thu Mar 13 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-6.20080310
- fix fbdev probing with no hardware to not load fbdev if pci slot claimed


xserver-1.5.0-bad-fbdev-thats-mine.patch:

--- NEW FILE xserver-1.5.0-bad-fbdev-thats-mine.patch ---
>From 656ca314bb97341a07d4bbd7fcfe7af9a3689761 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied at 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



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- xorg-x11-server.spec	12 Mar 2008 23:04:38 -0000	1.307
+++ xorg-x11-server.spec	13 Mar 2008 06:37:36 -0000	1.308
@@ -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 @@
 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 @@
 
 
 %changelog
+* Thu Mar 13 2008 Dave Airlie <airlied at 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 at 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)