1
0
xorg-x11-server/driver-autoconfig.diff

58 lines
2.1 KiB
Diff
Raw Normal View History

--- hw/xfree86/common/xf86AutoConfig.c.orig 2009-10-07 04:54:44.000000000 +0200
+++ hw/xfree86/common/xf86AutoConfig.c 2009-10-07 04:56:23.000000000 +0200
@@ -165,7 +165,11 @@ 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:
+ driverList[0] = "fglrx";
+ driverList[1] = "radeonhd";
+ driverList[2] = "ati";
+ break;
case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break;
case 0x8086:
@@ -179,7 +183,15 @@ videoPtrToDriverList(struct pci_device *
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 0x12d2: driverList[0] = "nv"; break;
+ case 0x10de:
+ driverList[0] = "nvidia";
+ driverList[1] = "nouveau";
+ /* GeForce 6150SE support broken (bnc #465190/544674) */
+ if (dev->device_id != 0x03D0) {
+ driverList[2] = "nv";
+ }
+ break;
case 0x1163: driverList[0] = "rendition"; break;
case 0x5333:
switch (dev->device_id)
@@ -205,7 +217,11 @@ videoPtrToDriverList(struct pci_device *
case 0x3d3d: driverList[0] = "glint"; break;
case 0x1023: driverList[0] = "trident"; break;
case 0x100c: driverList[0] = "tseng"; break;
- case 0x1106: driverList[0] = "openchrome"; break;
+ case 0x1106:
+ driverList[0] = "chrome9";
+ driverList[1] = "openchrome";
+ driverList[2] = "unichrome";
+ break;
case 0x15ad: driverList[0] = "vmware"; break;
case 0x18ca:
if (dev->device_id == 0x47)
@@ -213,6 +229,11 @@ videoPtrToDriverList(struct pci_device *
else
driverList[0] = "xgi";
break;
+ case 0x80ee:
+ if (dev->device_id == 0xbeef) {
+ driverList[0] = "vboxvideo";
+ }
+ break;
default: break;
}
for (i = 0; (i < returnListMax) && (driverList[i] != NULL); i++) {