xorg-server: Changes to 'debian-unstable'
debian/changelog | 3 +
debian/patches/fedora-bad-fbdev-thats-mine.patch | 43 +++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 47 insertions(+)
New commits:
commit daf26a14473563aa7368c93246f483b11e009d23
Author: Julien Cristau <jcristau@debian.org>
Date: Mon May 25 14:09:43 2009 +0200
When a PCI or SBUS driver is loaded, disable fbdev instead of killing the server
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).
diff --git a/debian/changelog b/debian/changelog
index c5627f0..240ca57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ xorg-server (2:1.6.1.901-3) UNRELEASED; urgency=low
* Only include hal info for keyboards, mice, touchpads and tablets in the
bug script.
* In the bug script, grep dmesg for agp in addition to drm.
+ * 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).
-- Julien Cristau <jcristau@debian.org> Thu, 14 May 2009 21:05:26 +0200
diff --git a/debian/patches/fedora-bad-fbdev-thats-mine.patch b/debian/patches/fedora-bad-fbdev-thats-mine.patch
new file mode 100644
index 0000000..b0def5a
--- /dev/null
+++ b/debian/patches/fedora-bad-fbdev-thats-mine.patch
@@ -0,0 +1,43 @@
+From cb1ac4a749a208eb8f9995042a110134977146d2 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@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(-)
+
+Index: xorg-server/hw/xfree86/common/xf86Bus.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86Bus.c
++++ xorg-server/hw/xfree86/common/xf86Bus.c
+@@ -429,6 +429,9 @@
+ EntityInfoPtr pEnt;
+ int i;
+
++ if (entityIndex == -1)
++ return NULL;
++
+ if (entityIndex >= xf86NumEntities)
+ return NULL;
+
+Index: xorg-server/hw/xfree86/common/xf86fbBus.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86fbBus.c
++++ xorg-server/hw/xfree86/common/xf86fbBus.c
+@@ -58,6 +58,13 @@
+ {
+ EntityPtr p;
+ int num;
++
++ if (pciSlotClaimed)
++ return -1;
++#if defined(__sparc__) || defined (__sparc64__)
++ if (sbusSlotClaimed)
++ return -1;
++#endif
+
+ num = xf86AllocateEntity();
+ p = xf86Entities[num];
diff --git a/debian/patches/series b/debian/patches/series
index d4db9f6..c17ca3e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ kfreebsd-ftbfs.diff
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
Reply to: