diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-14 00:01:30 +0000 |
| commit | 01a0c4bc740842efa3bf1a7e1d6c8be5656e4e2a (patch) | |
| tree | c9cf79fb6311cbb2a890419e0a382aa211fb3010 /extra/xorg-server/autoconfig-nvidia.patch | |
| parent | ca06c41d7d8e5d38284de9048372ab45dcd8b2fb (diff) | |
Wed Mar 14 00:01:29 UTC 2012
Diffstat (limited to 'extra/xorg-server/autoconfig-nvidia.patch')
| -rw-r--r-- | extra/xorg-server/autoconfig-nvidia.patch | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/extra/xorg-server/autoconfig-nvidia.patch b/extra/xorg-server/autoconfig-nvidia.patch index baa2eb601..9ed9b7aee 100644 --- a/extra/xorg-server/autoconfig-nvidia.patch +++ b/extra/xorg-server/autoconfig-nvidia.patch @@ -1,29 +1,28 @@ ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * +diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c +--- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 ++++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 +@@ -1111,7 +1111,23 @@ + { + int idx = 0; + #ifdef __linux__ +- driverList[idx++] = "nouveau"; ++ switch (dev->device_id) ++ { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[idx++] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[idx++] = "nouveau"; ++ break; ++ default: ++ driverList[idx++] = "nouveau"; ++ driverList[idx++] = "nvidia"; ++ break; ++ } + #endif + driverList[idx++] = "nv"; break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ driverList[2] = "nvidia"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; |