Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at Mon Jun 29 16:57:52 CEST 2009. -------- --- xorg-x11-server/xorg-x11-server.changes 2009-06-19 21:43:18.000000000 +0200 +++ xorg-x11-server/xorg-x11-server.changes 2009-06-24 19:06:23.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jun 24 18:17:18 CEST 2009 - mhopf@novell.com + +- Unclaim PCI slot if driver probing fails (fixes bnc #511529) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.Q11300/_old 2009-06-29 16:56:52.000000000 +0200 +++ /var/tmp/diff_new_pack.Q11300/_new 2009-06-29 16:56:52.000000000 +0200 @@ -33,7 +33,7 @@ Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.4 -Release: 43 +Release: 44 License: GPL v2 or later ; MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -126,6 +126,7 @@ Patch165: security-Revert-behavior-of-extension-access-for-co.patch Patch166: security-Fix-a-crash-caused-by-wrong-ordering-of-fo.patch Patch167: security-Grant-untrusted-windows-remove-access-on-a.patch +Patch168: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch %description This package contains the X.Org Server. @@ -260,6 +261,7 @@ %patch165 -p1 %patch166 -p1 %patch167 -p1 +%patch168 -p1 %build pushd xorg-docs-* ++++++ 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch ++++++

From 593348b46a21c6f291194fa9ff61bd5bc7c5cb9f Mon Sep 17 00:00:00 2001 From: Matthias Hopf <mhopf@suse.de> Date: Wed, 24 Jun 2009 18:26:23 +0200 Subject: [PATCH] Unclaim PCI slot if driver probing fails.

Otherwise no subsequent driver will be able to claim this pci slot. Example for this: fbdev tries to claim, but framebuffer device is not available. Later on VESA cannot claim the device. --- hw/xfree86/common/xf86.h | 1 + hw/xfree86/common/xf86Init.c | 3 ++- hw/xfree86/common/xf86pciBus.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletions(-) Index: xorg-server-1.6.1/hw/xfree86/common/xf86.h =================================================================== --- xorg-server-1.6.1.orig/hw/xfree86/common/xf86.h +++ xorg-server-1.6.1/hw/xfree86/common/xf86.h @@ -97,6 +97,7 @@ extern Bool xf86DRI2Enabled(void); Bool xf86CheckPciSlot( const struct pci_device * ); int xf86ClaimPciSlot( struct pci_device *, DriverPtr drvp, int chipset, GDevPtr dev, Bool active); +void xf86UnclaimPciSlot(struct pci_device *); Bool xf86ParsePciBusString(const char *busID, int *bus, int *device, int *func); Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func); Index: xorg-server-1.6.1/hw/xfree86/common/xf86Init.c =================================================================== --- xorg-server-1.6.1.orig/hw/xfree86/common/xf86Init.c +++ xorg-server-1.6.1/hw/xfree86/common/xf86Init.c @@ -514,7 +514,8 @@ probe_devices_from_device_sections(Drive if ((*drvp->PciProbe)(drvp, entry, pPci, devices[j].match_data)) { foundScreen = TRUE; - } + } else + xf86UnclaimPciSlot(pPci); } break; Index: xorg-server-1.6.1/hw/xfree86/common/xf86pciBus.c =================================================================== --- xorg-server-1.6.1.orig/hw/xfree86/common/xf86pciBus.c +++ xorg-server-1.6.1/hw/xfree86/common/xf86pciBus.c @@ -755,6 +755,25 @@ xf86ClaimPciSlot(struct pci_device * d, } /* + * Unclaim PCI slot, e.g. if probing failed, so that a different driver can claim. + */ +void +xf86UnclaimPciSlot(struct pci_device *d) +{ + int i; + + for (i = 0; i < xf86NumEntities; i++) { + const EntityPtr p = xf86Entities[i]; + + if ((p->bus.type == BUS_PCI) && (p->bus.id.pci == d)) { + /* Probably the slot should be deallocated? */ + p->bus.type = BUS_NONE; + return; + } + } +} + +/* * Parse a BUS ID string, and return the PCI bus parameters if it was * in the correct format for a PCI bus id. */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org