diff --git a/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff b/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff index a8c0cfbbf1..170d7d8cca 100644 --- a/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff +++ b/packages/x11/xserver/xorg-server/patches/75_nvidia-drv.diff @@ -1,39 +1,12 @@ -diff -Naur xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86AutoConfig.c xorg-server-1.6.99.902/hw/xfree86/common/xf86AutoConfig.c ---- xorg-server-1.6.99.902.orig/hw/xfree86/common/xf86AutoConfig.c 2009-09-26 14:12:03.000000000 +0200 -+++ xorg-server-1.6.99.902/hw/xfree86/common/xf86AutoConfig.c 2009-09-26 14:14:04.000000000 +0200 -@@ -192,7 +192,34 @@ +diff -Naur xorg-server-1.7.99.1/hw/xfree86/common/xf86AutoConfig.c xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86AutoConfig.c +--- xorg-server-1.7.99.1/hw/xfree86/common/xf86AutoConfig.c 2009-10-13 19:04:27.000000000 +0200 ++++ xorg-server-1.7.99.1.patch/hw/xfree86/common/xf86AutoConfig.c 2009-12-04 21:39:57.414303608 +0100 +@@ -192,7 +192,7 @@ 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: -+ switch (dev->device_id & 0xfff0) { -+ /* Non-functional with both nouveau and nv */ -+ case 0x0840: -+ case 0x0860: -+ driverList[0] = "nvidia"; -+ driverList[1] = "vesa"; -+ break; -+ default: -+ driverList[0] = "nvidia"; -+ driverList[1] = "nouveau"; -+ driverList[2] = "nv"; -+ break; -+ } -+ break; -+ } ++ case 0x10de: case 0x12d2: driverList[0] = "nvidia"; break; case 0x1106: driverList[0] = "openchrome"; break; case 0x1163: driverList[0] = "rendition"; break; case 0x5333: