[patch] 06_use_proc_instead_of_sysfs_for_pci_domains patch from Debian

06_use_proc_instead_of_sysfs_for_pci_domains.diff (text/plain), 1.65 KB, created by Dmitry 'MAD' Artamonow on 2007-07-20 10:06:32 UTC

Upstream commit 56f21bda1ce95741c88c423b60bd709eef26eb12 was supposed to 
only avoid multiple scans of the PCI devices, but it actually also added 
an "optimization" based on using sysfs files instead of /proc. However, 
this code is broken, for instance because there are no ioctl handler on 
/sys/bus/pci/devices/*/config files while there some on /proc/bus/pci/* 
 
It breaks the Xserver on architectures that require such ioctls to scan 
the PCI devices and/or deal with PCI domains: 
#422077: xserver-xorg: Fatal server error on sparc: xf86MapPciMem failed 
#422095: xserver-xorg-core: fails to start on powerpc, no devices detected 
 
The following patch forces the server to behave as if we were running on 
a 2.4 kernel while scanning PCI devices, so that the sysfs code is disabled. 
 
Upstream doesn't apply this patch since they want to fix the sysfs-code. 
See https://bugs.freedesktop.org/show_bug.cgi?id=7248 
 
Thanks to Jim Watson for testing! 
 
--- 
 hw/xfree86/os-support/bus/linuxPci.c | 2 +- 
 1 file changed, 1 insertion(+), 1 deletion(-) 
 
Index: xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c 
=================================================================== 
--- xorg-server-1.3.0.0.dfsg.orig/hw/xfree86/os-support/bus/linuxPci.c    2007-05-10 21:51:55.000000000 +0200 
+++ xorg-server-1.3.0.0.dfsg/hw/xfree86/os-support/bus/linuxPci.c    2007-05-10 21:52:13.000000000 +0200 
@@ -148,7 +148,7 @@ 
     int        domain, bus, dev, func; 
     char        file[64]; 
     struct stat    ignored; 
-    static int is26 = -1; 
+    static int is26 = 0; 
 
     domain = PCI_DOM_FROM_TAG(tag); 
     bus = PCI_BUS_NO_DOMAIN(PCI_BUS_FROM_TAG(tag));