From 16590f427347f68f7fbee5492833b3feade00c18 Mon Sep 17 00:00:00 2001 From: Fedora X Ninjas Date: Thu, 18 Jun 2009 13:45:57 +1000 Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs --- hw/xfree86/common/xf86AutoConfig.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index ada1ca5..abcedde 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -181,7 +181,19 @@ 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: + switch (dev->device_id & 0xfff0) { + /* Non-functional with both nouveau and nv */ + case 0x0840: + case 0x0860: + driverList[0] = "vesa"; + break; + default: + driverList[0] = "nouveau"; + break; + } + break; + case 0x12d2: driverList[0] = "nv"; break; case 0x1106: driverList[0] = "openchrome"; break; case 0x1163: driverList[0] = "rendition"; break; case 0x5333: -- 1.6.3.rc1.2.g0164.dirty