debian/changelog | 2 -
debian/patches/104_nvidia_autodetect.patch | 41 +++++++++++++++++++++++++++++
debian/patches/178_nvidia_autodetect.patch | 41 -----------------------------
debian/patches/series | 2 -
4 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit d2620507214f217783063e9a6841c2f6fa2bcb3c
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Jul 3 00:26:33 2009 +0300
Fix DOS formatting from the nvidia patch, and renumber it as patch 104
diff --git a/debian/changelog b/debian/changelog
index c4eefdf..1b70af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xorg-server (2:1.6.1.901-2ubuntu3) UNRELEASED; urgency=low
- * Add 178_nvidia_autodetect.patch - Automatically detect and use -nvidia
+ * Add 104_nvidia_autodetect.patch - Automatically detect and use -nvidia
or -nouveau instead of -nv if installed. Thanks Sarvatt!
-- Bryce Harrington <br...@ubuntu.com> Thu, 02 Jul 2009 14:05:40 -0700
diff --git a/debian/patches/104_nvidia_autodetect.patch
b/debian/patches/104_nvidia_autodetect.patch
new file mode 100644
index 0000000..ac3383b
--- /dev/null
+++ b/debian/patches/104_nvidia_autodetect.patch
@@ -0,0 +1,41 @@
+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)
+
diff --git a/debian/patches/178_nvidia_autodetect.patch
b/debian/patches/178_nvidia_autodetect.patch
deleted file mode 100644
index 483e22d..0000000
--- a/debian/patches/178_nvidia_autodetect.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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)
-
diff --git a/debian/patches/series b/debian/patches/series
index ff31875..5be1dbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ Add-libgcrypt-as-an-option-for-sha1.diff
101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
102_ubuntu_sharevts_load_cpu.patch
103_psb_auto.patch
+104_nvidia_autodetect.patch
110_fedora_no_move_damage.patch
121_only_switch_vt_when_active.diff
135_rethrow_signals.patch
@@ -30,4 +31,3 @@ 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
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
