xorg-server: Changes to 'ubuntu'
debian/patches/105_fglrx_autodetect.patch | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 373935d6a0bee920a6277311b26b985e19251f84
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Jul 2 16:17:24 2009 -0700
Okay, let's be ballsy and even try -fglrx on older cards; who knows, it
may work. If -fglrx is installed it's going to break -ati anyway.
diff --git a/debian/patches/105_fglrx_autodetect.patch b/debian/patches/105_fglrx_autodetect.patch
index 90ae00c..74e93e3 100644
--- a/debian/patches/105_fglrx_autodetect.patch
+++ b/debian/patches/105_fglrx_autodetect.patch
@@ -1,24 +1,20 @@
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:59:14.000000000 -0700
-@@ -165,7 +165,19 @@ videoPtrToDriverList(struct pci_device *
++++ working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 16:16:59.000000000 -0700
+@@ -165,7 +165,15 @@ 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 < 0x791e)
-+ {
-+ driverList[0] = "radeonhd";
-+ driverList[1] = "ati";
-+ }
-+ else
-+ {
-+ driverList[0] = "fglrx"; /* Supports R600 and newer only */
-+ driverList[1] = "radeonhd";
-+ driverList[2] = "ati";
-+ }
++ /* Technical fglrx works only on 0x791e and newer, but
++ if the user has it installed, -ati and -radeonhd
++ probably won't work anyway so we may as well try it
++ in case it randomly does work. */
++ driverList[0] = "fglrx"; /* Supports R600 and newer only */
++ driverList[1] = "radeonhd";
++ driverList[2] = "ati";
+ break;
case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break;
Reply to: