From d0c6732a99c9a7e40752b9ba7898a01c325103fa Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Wed, 20 Apr 2011 14:34:52 +0300 Subject: xfree86: add nouveau as the first automatic driver for NVIDIA hardware Add nouveau as the first driver on linux for NVIDIA hardware when driver autoconfiguration is done, as it is more capable than nv. nv is also kept in the list as it is more widely supported and because some old cards are not supported by nouveau. Signed-off-by: Anssi Hannula Reviewed-by: Daniel Stone Reviewed-by: Cyril Brulebois Reviewed-by: Jeremy Huddleston Signed-off-by: Keith Packard --- hw/xfree86/common/xf86pciBus.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'hw/xfree86/common/xf86pciBus.c') diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index eb5323cf0..bc09bd20c 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1116,7 +1116,15 @@ videoPtrToDriverList(struct pci_device *dev, 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: + { + int idx = 0; +#ifdef __linux__ + driverList[idx++] = "nouveau"; +#endif + driverList[idx++] = "nv"; + break; + } case 0x1106: driverList[0] = "openchrome"; break; case 0x1b36: driverList[0] = "qxl"; break; case 0x1163: driverList[0] = "rendition"; break; -- cgit v1.2.3