xorg-server: Changes to 'debian-unstable'
debian/changelog | 4 +
debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff | 36 ++++++++++
debian/patches/series | 1
debian/xserver-xephyr.docs | 1
4 files changed, 42 insertions(+)
New commits:
commit 83c368c83e646f0bda4826ba8b2fbf2e30d477de
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Fri May 11 20:04:40 2007 +0200
Install the Xephyr README, closes: #395888.
diff --git a/debian/changelog b/debian/changelog
index 0dfd8d8..2c87ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xorg-server (2:1.3.0.0.dfsg-5) UNRELEASED; urgency=low
* Add 06_use_proc_instead_of_sysfs_for_pci_domains.diff since sysfs-based
PCI management code is broken at least on sparc and powerpc.
Closes: #422077, #422095. Thanks to Jim Watson for testing!
+ * Install the Xephyr README, closes: #395888.
-- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 11 May 2007 02:37:19 +0200
diff --git a/debian/xserver-xephyr.docs b/debian/xserver-xephyr.docs
new file mode 100644
index 0000000..059d734
--- /dev/null
+++ b/debian/xserver-xephyr.docs
@@ -0,0 +1 @@
+hw/kdrive/ephyr/README
commit ab074a3ff1ee408e9dcf3d8a7937624cacf86461
Author: Brice Goglin <Brice.Goglin@ens-lyon.org>
Date: Fri May 11 19:42:00 2007 +0200
Add 06_use_proc_instead_of_sysfs_for_pci_domains.diff
diff --git a/debian/changelog b/debian/changelog
index c38ff5e..0dfd8d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ xorg-server (2:1.3.0.0.dfsg-5) UNRELEASED; urgency=low
* Add 24_hurd_ioperm_fix.diff to fix xf86Enable/DisableIO on Hurd with
recent GNU Mach. Thanks Samuel Thibault!
+ * Add 06_use_proc_instead_of_sysfs_for_pci_domains.diff since sysfs-based
+ PCI management code is broken at least on sparc and powerpc.
+ Closes: #422077, #422095. Thanks to Jim Watson for testing!
-- Brice Goglin <Brice.Goglin@ens-lyon.org> Fri, 11 May 2007 02:37:19 +0200
diff --git a/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff b/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff
new file mode 100644
index 0000000..faf6557
--- /dev/null
+++ b/debian/patches/06_use_proc_instead_of_sysfs_for_pci_domains.diff
@@ -0,0 +1,36 @@
+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));
diff --git a/debian/patches/series b/debian/patches/series
index 0a454ae..096a22e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
03_xnest_manpage_overhaul.diff
04_read_rom_in_chunks.diff
05_module_defaults.diff
+06_use_proc_instead_of_sysfs_for_pci_domains.diff
07_xorgconf_manpage_overhaul.diff -p0
08_s390_servermd.diff
09_debian_xserver_rtff.diff -p0
Reply to: