xorg-server: Changes to 'ubuntu'
debian/changelog | 7 +++++
debian/patches/178_nvidia_autodetect.patch | 40 +++++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 48 insertions(+)
New commits:
commit 399677d1582d4c6f1c5f4546d31ba7cb1acae746
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 2 13:36:42 2009 -0700
Patch from Sarvatt to autodetect nvidia
diff --git a/debian/changelog b/debian/changelog
index 17ef542..56b4a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.6.1.901-2ubuntu3) karmic; urgency=low
+
+ * Add 178_nvidia_autodetect.patch - Automatically detect and use -nvidia
+ or -nouveau instead of -nv if installed. Thanks Sarvatt!
+
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 02 Jul 2009 13:28:42 -0700
+
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
diff --git a/debian/patches/178_nvidia_autodetect.patch b/debian/patches/178_nvidia_autodetect.patch
new file mode 100644
index 0000000..fe2a769
--- /dev/null
+++ b/debian/patches/178_nvidia_autodetect.patch
@@ -0,0 +1,40 @@
+diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
+index 19c06c8..e40551e 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
++++ b/hw/xfree86/common/xf86AutoConfig.c
+ -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev,
+ case 0x102b: driverList[0] = "mga"; break;
+ case 0x10c8: driverList[0] = "neomagic"; break;
+ case 0x105d: driverList[0] = "i128"; break;
+- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
++ case 0x10de: case 0x12d2:
++ switch (dev->device_id) {
++ /* NV1 */
++ case 0x0008:
++ case 0x0009:
++ driverList[0] = "vesa";
++ break;
++ /* NV3 */
++ case 0x0018:
++ case 0x0019:
++ driverList[0] = "nv";
++ break;
++ default:
++ switch (dev->device_id & 0xfff0) {
++ /* Non-functional with both nouveau and nv */
++ case 0x0840:
++ case 0x0860:
++ driverList[0] = "nvidia";
++ driverList[1] = "vesa";
++ break;
++ default:
++ driverList[0] = "nvidia";
++ driverList[1] = "nouveau";
++ driverList[2] = "nv";
++ break;
++ }
++ break;
++ }
+ case 0x1163: driverList[0] = "rendition"; break;
+ case 0x5333:
+ switch (dev->device_id)
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 8f6ebc2..ff31875 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ Add-libgcrypt-as-an-option-for-sha1.diff
174_set_bg_pixmap_of_cow_to_none.patch
177_animated_cursor_change_master.patch
xserver-1.5.0-bad-fbdev-thats-mine.patch
+178_nvidia_autodetect.patch
Reply to: