520bba9947
- Today's git snapshot. - disable Xdmx - it's broken upstream - Removing patches merged upstream or obsolete. xserver-1.4.99-endian.patch - obsolete with autoconf 2.63-1 (#449944) xserver-1.5.99.902-sod-off-poulsbo.patch - upstream xserver-1.6.0-selinux-less.patch - upstream xserver-1.5.99.902-vnc.patch - upstream xserver-1.6.0-restore-zap.patch - upstream xserver-1.6.0-xinerama-cursors.patch - upstream xserver-1.6.0-xinerama-crashes.patch - obsolete, server 1.6 only xserver-1.6.1-xkbsendmap.patch - upstream xserver-1.6.0-randr-xinerama-crash.patch - upstream xserver-1.6.1-avoid-malloc-for-logging.patch - upstream xserver-1.6.1-exa-avoid-swapped-out.patch - upstream xserver-1.6.1-exa-create-pixmap2.patch - upstream xserver-1.6.1-fix-glx-drawable.patch - upstream xserver-1.6.1-randr-gamma.patch - upstream xserver-1.6.1-vt-switch.patch - obsolete xserver-1.6.1-pea-quirk.patch - will be upstream
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 16590f427347f68f7fbee5492833b3feade00c18 Mon Sep 17 00:00:00 2001
|
|
From: Fedora X Ninjas <x@fedoraproject.org>
|
|
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
|
|
|