From f5e43a8e1bcbb9eab0ca6fcef6c26b6e83eca483 Mon Sep 17 00:00:00 2001 From: Fedora X Ninjas Date: Tue, 16 Feb 2010 11:38:17 +1000 Subject: [PATCH 2/9] autoconfig: select nouveau by default for NVIDIA GPUs Also, don't treat DRI setup failure as an error for nouveau. --- hw/xfree86/common/xf86pciBus.c | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 447b192..26d6cad 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1123,7 +1123,23 @@ 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: + 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"; + break; + } + break; case 0x1106: driverList[0] = "openchrome"; break; case 0x1b36: driverList[0] = "qxl"; break; case 0x1163: driverList[0] = "rendition"; break; -- 1.7.4.4