debian/changelog | 4 ++-- debian/patches/105_fglrx_autodetect.patch | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-)
New commits: commit da618048dcca2aa648ec8591eadc29d8db39eed3 Author: Bryce Harrington <[email protected]> Date: Thu Jul 2 16:00:50 2009 -0700 Guess we can also do -radeonhd diff --git a/debian/changelog b/debian/changelog index d6d99ee..3de47df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,9 +3,9 @@ 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. + on R600 and newer hardware or -radeonhd if either is installed. - -- Bryce Harrington <[email protected]> Thu, 02 Jul 2009 15:27:10 -0700 + -- Bryce Harrington <[email protected]> Thu, 02 Jul 2009 15:59:58 -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 index 0d0e895..90ae00c 100644 --- a/debian/patches/105_fglrx_autodetect.patch +++ b/debian/patches/105_fglrx_autodetect.patch @@ -1,21 +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 * ++++ working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:59:14.000000000 -0700 +@@ -165,7 +165,19 @@ 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) ++ if (dev->device_id < 0x791e) + { -+ driverList[0] = "ati"; ++ driverList[0] = "radeonhd"; ++ driverList[1] = "ati"; + } + else + { + driverList[0] = "fglrx"; /* Supports R600 and newer only */ -+ driverList[1] = "ati"; ++ driverList[1] = "radeonhd"; ++ driverList[2] = "ati"; + } + break; case 0x102c: driverList[0] = "chips"; break; -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
