xorg-server: Changes to 'ubuntu'
debian/changelog | 13 +++++++++--
debian/patches/206_intel_8xx_default_to_fbdev.patch | 22 ++++++++++++++++++++
debian/patches/series | 1
3 files changed, 33 insertions(+), 3 deletions(-)
New commits:
commit e1f047bc1fe7f3e7c4fa9a2467362250aa25f8bd
Author: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
Date: Mon Sep 13 21:32:00 2010 +1000
Don't autoload intel on the annoying i8xx cards
diff --git a/debian/changelog b/debian/changelog
index c89967e..ba29e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-xorg-server (2:1.9.0-0ubuntu6) UNRELEASED; urgency=low
-
+xorg-server (2:1.9.0-0ubuntu6) maverick; urgency=low
+
+ [ Chase Douglas ]
* Fix udev USB product ID parsing (LP: #628214)
- debian/patches:
+ 205_udev-product-ids.patch
- -- Chase Douglas <chase.douglas@ubuntu.com> Wed, 01 Sep 2010 16:28:23 -0400
+ [ Christopher James Halse Rogers ]
+ * debian/patches/206_intel_8xx_default_to_fbdev.patch:
+ - Don't autoload the intel driver on i830, i845g and i855. These are
+ still too unstable with KMS/GEM. X will autoload the fbdev driver
+ (if using KMS) or the vesa driver instead. (LP: #633593)
+
+ -- Christopher James Halse Rogers <raof@ubuntu.com> Mon, 13 Sep 2010 18:48:54 +1000
xorg-server (2:1.9.0-0ubuntu5) maverick; urgency=low
diff --git a/debian/patches/206_intel_8xx_default_to_fbdev.patch b/debian/patches/206_intel_8xx_default_to_fbdev.patch
new file mode 100644
index 0000000..c6a0d44
--- /dev/null
+++ b/debian/patches/206_intel_8xx_default_to_fbdev.patch
@@ -0,0 +1,22 @@
+Description: Drop intel from the autoloaded drivers for i830, i845g, i855
+ .
+ These remain too unstable with the intel DDX.
+Author: Christopher James Halse Rogers <christohper.halse.rogers@canonical.com>
+
+Index: xorg-server/hw/xfree86/common/xf86pciBus.c
+===================================================================
+--- xorg-server.orig/hw/xfree86/common/xf86pciBus.c 2010-09-13 19:54:39.330148002 +1000
++++ xorg-server/hw/xfree86/common/xf86pciBus.c 2010-09-13 20:54:08.000000000 +1000
+@@ -1112,6 +1112,12 @@
+ driverList[0] = "i740";
+ } else if (dev->device_id == 0x8108) {
+ break; /* "hooray" for poulsbo */
++ } else if (dev->device_id == 0x3577) {
++ break; /* Let i830 fall back to fbdev / vesa */
++ } else if (dev->device_id == 0x2562) {
++ break; /* Let i845g fall back to fbdev / vesa */
++ } else if (dev->device_id == 0x3582) {
++ break; /* Let i855 fall back to fbdev / vesa */
+ } else {
+ driverList[0] = "intel";
+ }
diff --git a/debian/patches/series b/debian/patches/series
index e1e43a9..39e0c56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,3 +35,4 @@
203_gestures-extension.patch
204_fix-neg-sync-transition.patch
205_udev-product-ids.patch
+206_intel_8xx_default_to_fbdev.patch
Reply to: