xorg-server: Changes to 'debian-unstable'
debian/changelog | 5 +
debian/patches/fedora-pci-primary.diff | 110 +++++++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 116 insertions(+)
New commits:
commit e2cc1592543dd556881984287cb1c1b52bfec7e7
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 25 14:37:47 2009 +0200
Hack around missing detection of the primary PCI device
Add patch stolen from Fedora to try and detect the primary PCI device by
mapping the legacy VGA bios and comparing the vendor and device ids.
Previously if there was more than one VGA device and the config didn't
specify BusIDs, the server would just fail to start, so this hack should
improve things.
diff --git a/debian/changelog b/debian/changelog
index 240ca57..7b57c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,11 @@ xorg-server (2:1.6.1.901-3) UNRELEASED; urgency=low
* Add patch stolen from Fedora to disable the fbdev driver when it's loaded
together with a PCI or SBUS driver, instead of calling FatalError (closes:
#508476).
+ * Add patch stolen from Fedora to try and detect the primary PCI device by
+ mapping the legacy VGA bios and comparing the vendor and device ids.
+ Previously if there was more than one VGA device and the config didn't
+ specify BusIDs, the server would just fail to start, so this hack should
+ improve things.
-- Julien Cristau <jcristau@debian.org> Thu, 14 May 2009 21:05:26 +0200
diff --git a/debian/patches/fedora-pci-primary.diff b/debian/patches/fedora-pci-primary.diff
new file mode 100644
index 0000000..e4e8b41
--- /dev/null
+++ b/debian/patches/fedora-pci-primary.diff
@@ -0,0 +1,110 @@
+From b0f7839b34d4110dd08d523c01dc1d4b4c74cfb6 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 3 Mar 2009 10:58:33 -0500
+Subject: [PATCH] Primary video device hack
+
+---
+ hw/xfree86/common/xf86pciBus.c | 62 +++++++++++++++++++++++++++++++---------
+ 1 files changed, 48 insertions(+), 14 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index 467a0c3..18f104f 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -58,13 +58,7 @@ static struct pci_device ** xf86PciVideoInfo = NULL; /* PCI probe for video hw *
+
+
+ /* PCI classes that get included in xf86PciVideoInfo */
+-#define PCIINFOCLASSES(c) \
+- ( (((c) & 0x00ff0000) == (PCI_CLASS_PREHISTORIC << 16)) \
+- || (((c) & 0x00ff0000) == (PCI_CLASS_DISPLAY << 16)) \
+- || ((((c) & 0x00ffff00) \
+- == ((PCI_CLASS_MULTIMEDIA << 16) | (PCI_SUBCLASS_MULTIMEDIA_VIDEO << 8)))) \
+- || ((((c) & 0x00ffff00) \
+- == ((PCI_CLASS_PROCESSOR << 16) | (PCI_SUBCLASS_PROCESSOR_COPROC << 8)))) )
++#define PCIINFOCLASSES(c) (((c) & 0x00ffff00) == (PCI_CLASS_DISPLAY << 16))
+
+ /*
+ * PCI classes that have messages printed always. The others are only
+@@ -341,6 +335,39 @@ restorePciBusState(BusAccPtr ptr)
+ }
+ #undef MASKBITS
+
++/* oh god what have i done */
++static Bool
++looks_like_bios_primary(struct pci_device *info)
++{
++ unsigned char *bios;
++ unsigned short vendor, device;
++ int offset;
++ Bool ret = FALSE;
++
++ bios = xf86MapVidMem(-1, VIDMEM_MMIO, 0xc0000, 0x10000);
++ if (!bios)
++ return FALSE;
++
++ if (bios[0] != 0x55 || bios[1] != 0xAA)
++ goto out;
++
++ offset = (bios[0x19] << 8) + bios[0x18];
++
++ if (bios[offset] != 'P' ||
++ bios[offset+1] != 'C' ||
++ bios[offset+2] != 'I' ||
++ bios[offset+3] != 'R')
++ goto out;
++
++ vendor = (bios[offset+5] << 8) + bios[offset+4];
++ device = (bios[offset+7] << 8) + bios[offset+6];
++
++ ret = (info->vendor_id == vendor) && (info->device_id == device);
++
++out:
++ xf86UnMapVidMem(-1, bios, 0x10000);
++ return ret;
++}
+
+ /*
+ * xf86Bus.c interface
+@@ -375,24 +402,31 @@ xf86PciProbe(void)
+ }
+ }
+
+-
+ /* If we haven't found a primary device try a different heuristic */
+ if (primaryBus.type == BUS_NONE && num) {
+ for (i = 0; i < num; i++) {
+ uint16_t command;
+
+ info = xf86PciVideoInfo[i];
++ if (!IS_VGA(info->device_class))
++ continue;
++
+ pci_device_cfg_read_u16(info, & command, 4);
+
+- if ((command & PCI_CMD_MEM_ENABLE)
+- && ((num == 1) || IS_VGA(info->device_class))) {
+- if (primaryBus.type == BUS_NONE) {
++ if ((command & PCI_CMD_MEM_ENABLE)) {
++ if (num == 1) {
+ primaryBus.type = BUS_PCI;
+ primaryBus.id.pci = info;
+- } else {
+- xf86Msg(X_NOTICE,
++ break;
++ } else if (looks_like_bios_primary(info)) {
++ if (primaryBus.type == BUS_NONE) {
++ primaryBus.type = BUS_PCI;
++ primaryBus.id.pci = info;
++ } else {
++ xf86Msg(X_NOTICE,
+ "More than one possible primary device found\n");
+- primaryBus.type ^= (BusType)(-1);
++ primaryBus.type ^= (BusType)(-1);
++ }
+ }
+ }
+ }
+--
+1.6.2.2
+
diff --git a/debian/patches/series b/debian/patches/series
index c17ca3e..1af063f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ Turn-on-ModeDebug-by-default.patch
Change-default-for-ExaOptimizeMigration-to-false.diff
Add-libgcrypt-as-an-option-for-sha1.diff
fedora-bad-fbdev-thats-mine.patch
+fedora-pci-primary.diff
Reply to: