xorg-server: Changes to 'ubuntu'
debian/changelog | 4 +++-
debian/patches/105_fglrx_autodetect.patch | 23 +++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 9d66c2277d54004a68ecaedd7bf491a6bdc2f947
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 2 15:30:09 2009 -0700
Add similar patch for -fglrx
diff --git a/debian/changelog b/debian/changelog
index 1b70af1..d6d99ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg-server (2:1.6.1.901-2ubuntu3) UNRELEASED; urgency=low
* Add 104_nvidia_autodetect.patch - Automatically detect and use -nvidia
or -nouveau instead of -nv if installed. Thanks Sarvatt!
+ * Add 105_fglrx_autodetect.patch - Automatically detect and use -fglrx
+ on R600 and newer hardware if it is installed.
- -- Bryce Harrington <bryce@ubuntu.com> Thu, 02 Jul 2009 14:05:40 -0700
+ -- Bryce Harrington <bryce@ubuntu.com> Thu, 02 Jul 2009 15:27:10 -0700
xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low
diff --git a/debian/patches/105_fglrx_autodetect.patch b/debian/patches/105_fglrx_autodetect.patch
new file mode 100644
index 0000000..0d0e895
--- /dev/null
+++ b/debian/patches/105_fglrx_autodetect.patch
@@ -0,0 +1,23 @@
+Binary files patched/.git/index and working/.git/index differ
+diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c working/hw/xfree86/common/xf86AutoConfig.c
+--- patched/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:11:52.000000000 -0700
++++ working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:18:18.000000000 -0700
+@@ -165,7 +165,17 @@ videoPtrToDriverList(struct pci_device *
+ case 0x1142: driverList[0] = "apm"; break;
+ case 0xedd8: driverList[0] = "ark"; break;
+ case 0x1a03: driverList[0] = "ast"; break;
+- case 0x1002: driverList[0] = "ati"; break;
++ case 0x1002:
++ if (dev->device_id < 0x9400)
++ {
++ driverList[0] = "ati";
++ }
++ else
++ {
++ driverList[0] = "fglrx"; /* Supports R600 and newer only */
++ driverList[1] = "ati";
++ }
++ break;
+ case 0x102c: driverList[0] = "chips"; break;
+ case 0x1013: driverList[0] = "cirrus"; break;
+ case 0x8086:
diff --git a/debian/patches/series b/debian/patches/series
index 5be1dbf..08e3664 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ Add-libgcrypt-as-an-option-for-sha1.diff
102_ubuntu_sharevts_load_cpu.patch
103_psb_auto.patch
104_nvidia_autodetect.patch
+105_fglrx_autodetect.patch
110_fedora_no_move_damage.patch
121_only_switch_vt_when_active.diff
135_rethrow_signals.patch
Reply to: