debian/changelog | 9 +++
debian/patches/series | 1
debian/patches/xserver-1.5.0-bad-fbdev-thats-mine.patch | 46 ++++++++++++++++
3 files changed, 56 insertions(+)
New commits:
commit b3aa1c92a85cb80d307ea7703265e0db3c20c8cc
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Fri Jun 26 23:48:32 2009 -0700
Add xserver-1.5.0-bad-fbdev-thats-mine.patch
diff --git a/debian/changelog b/debian/changelog
index e31a5dd..17ef542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low
+
+ * Add xserver-1.5.0-bad-fbdev-thats-mine.patch - If no xorg.conf is
+ specified, framebuffer device can erroneously grab the PCI. Make
+ it fail instead in this case.
+ (LP: #383407)
+
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 24 Jun 2009 15:24:44 -0700
+
xorg-server (2:1.6.1.901-2ubuntu1) karmic; urgency=low
* Merge from Debian unstable.
diff --git a/debian/patches/series b/debian/patches/series
index 2ec9c82..8f6ebc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,3 +29,4 @@ Add-libgcrypt-as-an-option-for-sha1.diff
172_cwgetbackingpicture_nullptr_check.patch
174_set_bg_pixmap_of_cow_to_none.patch
177_animated_cursor_change_master.patch
+xserver-1.5.0-bad-fbdev-thats-mine.patch
diff --git a/debian/patches/xserver-1.5.0-bad-fbdev-thats-mine.patch
b/debian/patches/xserver-1.5.0-bad-fbdev-thats-mine.patch
new file mode 100644
index 0000000..a51920b
--- /dev/null
+++ b/debian/patches/xserver-1.5.0-bad-fbdev-thats-mine.patch
@@ -0,0 +1,46 @@
+From cb1ac4a749a208eb8f9995042a110134977146d2 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airl...@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 | 7 +++++++
+ 2 files changed, 10 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..cfd8811 100644
+--- a/hw/xfree86/common/xf86fbBus.c
++++ b/hw/xfree86/common/xf86fbBus.c
+@@ -58,6 +58,13 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev,
Bool active)
+ {
+ EntityPtr p;
+ int num;
++
++ if (pciSlotClaimed)
++ return -1;
++#if defined(__sparc__) || defined (__sparc64__)
++ if (sbusSlotClaimed)
++ return -1;
++#endif
+
+ num = xf86AllocateEntity();
+ p = xf86Entities[num];
+--
+1.6.0.6
+
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
