xorg-server: Changes to 'ubuntu'
debian/changelog | 6 +++-
debian/patches/106_nouveau_autodetect.patch | 42 ++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit cfdca8e85ca73f18edaeff1a411e356afac2bc4c
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Tue Feb 16 21:04:13 2010 -0800
Automatically detect nouveau
diff --git a/debian/changelog b/debian/changelog
index 558dd57..2e8fde2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
xorg-server (2:1.7.4-2ubuntu1) UNRELEASED; urgency=low
+ [Robert Hooker]
+ * Add 106_nouveau_autodetect.patch: makes nouveau the default driver
+ for supported cards when not explicitly named in xorg.conf.
+
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 101, included in Debian.
@@ -8,7 +12,7 @@ xorg-server (2:1.7.4-2ubuntu1) UNRELEASED; urgency=low
* Add 199_xfvb-help-typo.patch to fix typo in help for xvfb (fdo #32990)
* Add 200_randr-null.patch to clarify a pointer initialization (fdo #26389)
- -- Timo Aaltonen <tjaalton@ubuntu.com> Fri, 05 Feb 2010 16:14:37 +0200
+ -- Bryce Harrington <bryce@ubuntu.com> Tue, 16 Feb 2010 21:03:35 -0800
xorg-server (2:1.7.4-2) unstable; urgency=low
diff --git a/debian/patches/106_nouveau_autodetect.patch b/debian/patches/106_nouveau_autodetect.patch
new file mode 100644
index 0000000..ede281e
--- /dev/null
+++ b/debian/patches/106_nouveau_autodetect.patch
@@ -0,0 +1,42 @@
+Index: xserver-xorg-core/hw/xfree86/common/xf86AutoConfig.c
+===================================================================
+--- xserver-xorg-core.orig/hw/xfree86/common/xf86AutoConfig.c 2010-02-01 18:51:54.903592582 +1100
++++ xserver-xorg-core/hw/xfree86/common/xf86AutoConfig.c 2010-02-01 18:54:14.473621510 +1100
+@@ -192,7 +192,36 @@
+ break;
+ case 0x102b: driverList[0] = "mga"; break;
+ case 0x10c8: driverList[0] = "neomagic"; break;
+- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
++ case 0x10de: case 0x12d2:
++ switch (dev->device_id) {
++ /* NV1 - NV2 are unsupported by nouveau, or nv */
++ case 0x0008:
++ case 0x0009:
++ case 0x0010:
++ driverList[0] = "vesa";
++ break;
++ /* NV3 is supported by nv */
++ case 0x0018:
++ case 0x0019:
++ driverList[0] = "nv";
++ break;
++ /* Everything else is supported by nouveau */
++ default:
++ switch (dev->device_id & 0xfff0) {
++ /* These integrated cards apparently don't work with the
++ nv driver. Nouveau does support them */
++ case 0x0840:
++ case 0x0860:
++ driverList[0] = "nouveau";
++ break;
++ default:
++ driverList[0] = "nouveau";
++ driverList[1] = "nv";
++ break;
++ }
++ break;
++ }
++ break;
+ case 0x1106: driverList[0] = "openchrome"; break;
+ case 0x1163: driverList[0] = "rendition"; break;
+ case 0x5333:
diff --git a/debian/patches/series b/debian/patches/series
index 7caf3a0..11264d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@
100_rethrow_signals.patch
#104_nvidia_autodetect.patch
#105_fglrx_autodetect.patch
+106_nouveau_autodetect.patch
121_only_switch_vt_when_active.diff
#143_default_to_vesa.patch
157_check_null_modes.patch
Reply to: