debian/changelog | 8 ++++++++
debian/patches/186_autoconfig_geode.patch | 29 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 38 insertions(+)
New commits:
commit ce13d12933b937af2329c72743aaf96b6fa1b9cc
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Tue Sep 8 15:54:20 2009 -0700
Add geode autoconfigure support
diff --git a/debian/changelog b/debian/changelog
index e420ed4..312ca01 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.6.3-1ubuntu6) karmic; urgency=low
+
+ * Add 186_autoconfig_geode.patch: Add autoconfiguration support for
+ older geode cards. Cherrypick from upstream.
+ (LP: #423866)
+
+ -- Bryce Harrington <br...@ubuntu.com> Tue, 08 Sep 2009 15:43:28 -0700
+
xorg-server (2:1.6.3-1ubuntu5) karmic; urgency=low
* Add 185_dix_badwindow.patch: dixLookupWindow may return BadMatch if
diff --git a/debian/patches/186_autoconfig_geode.patch
b/debian/patches/186_autoconfig_geode.patch
new file mode 100644
index 0000000..4a42884
--- /dev/null
+++ b/debian/patches/186_autoconfig_geode.patch
@@ -0,0 +1,29 @@
+--- a/hw/xfree86/common/xf86AutoConfig.c 2009-07-07 20:48:58.000000000
+0300
++++ b/hw/xfree86/common/xf86AutoConfig.c 2009-09-04 00:32:08.000000000
+0300
+@@ -158,10 +158,25 @@ videoPtrToDriverList(struct pci_device *
+ {
++ /* AMD Geode LX */
+ case 0x1022:
+ if (dev->device_id == 0x2081) {
+ driverList[0] = "geode";
+- driverList[1] = "amd";
+ }
+ break;
++ /* older Geode products acquired by AMD but still carrying an NSC
vendor_id */
++ case 0x100B:
++ if (dev->device_id == 0x0030) {
++ /* NSC Geode GX2 specifically or... */
++ driverList[0] = "geode";
++ driverList[1] = "nsc";
++ } else
++ /* ... any kind of NSC Geode SC variant */
++ driverList[0] = "nsc";
++ break;
++ /* Cyrix Geode GX1 */
++ case 0x1078:
++ if (dev->device_id == 0x0104)
++ driverList[0] = "cyrix";
++ break;
+ case 0x1142: driverList[0] = "apm"; break;
+ case 0xedd8: driverList[0] = "ark"; break;
+ case 0x1a03: driverList[0] = "ast"; break;
diff --git a/debian/patches/series b/debian/patches/series
index 6d1c384..6b7d3a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,4 @@ fedora-pci-primary.diff
183_dont_reset_event_time.patch
184_virtual_devices_autodetect.patch
185_dix_badwindow.patch
+186_autoconfig_geode.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
