rpms/xorg-x11-server/F-11 xserver-1.6.1-nouveau.patch, NONE, 1.1 xorg-x11-server.spec, 1.441, 1.442 xserver-1.5.99.902-nouveau.patch, 1.1, NONE

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27439

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xserver-1.6.1-nouveau.patch 
Removed Files:
	xserver-1.5.99.902-nouveau.patch 
Log Message:
* Mon May 04 2009 Adam Jackson <ajax at redhat.com> 1.6.1-10
- xserver-1.6.1-nouveau.patch: Update the autoconfig logic for nv3 and other
  historical oddities.


xserver-1.6.1-nouveau.patch:

--- NEW FILE xserver-1.6.1-nouveau.patch ---
>From 10a3e677aa00d1fbeb4ec8cd5c77d609bc7091a7 Mon Sep 17 00:00:00 2001
From: Fedora X Ninjas <x at fedoraproject.org>
Date: Mon, 16 Feb 2009 15:50:14 +1000
Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs

---
 hw/xfree86/common/xf86AutoConfig.c |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 19c06c8..e40551e 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -181,7 +181,26 @@ videoPtrToDriverList(struct pci_device *dev,
 	case 0x102b:		    driverList[0] = "mga";	break;
 	case 0x10c8:		    driverList[0] = "neomagic"; break;
 	case 0x105d:		    driverList[0] = "i128";	break;
-	case 0x10de: case 0x12d2:   driverList[0] = "nv";	break;
+	case 0x10de: case 0x12d2:
+	    switch (dev->device_id & 0xfff0) {
+	    /* NV1 */
+	    case 0x0008:
+	    case 0x0009:
+	    /* Non-functional with both nouveau and nv */
+	    case 0x0840:
+	    case 0x0860:
+		driverList[0] = "vesa";
+		break;
+	    /* NV3 */
+	    case 0x0018:
+	    case 0x0019:
+		driverList[0] = "nv";
+		break;
+	    default:
+		driverList[0] = "nouveau";
+		break;
+	    }
+	    break;
 	case 0x1163:		    driverList[0] = "rendition"; break;
 	case 0x5333:
 	    switch (dev->device_id)
-- 
1.6.2.2



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -p -r1.441 -r1.442
--- xorg-x11-server.spec	23 Apr 2009 18:39:19 -0000	1.441
+++ xorg-x11-server.spec	4 May 2009 18:00:44 -0000	1.442
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1
-Release:   9%{?dist}
+Release:   10%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -89,7 +89,7 @@ Patch6013: xserver-1.6.0-selinux-less.pa
 Patch6015: xserver-1.5.99.902-vnc.patch
 
 # Make autoconfiguration chose nouveau driver for NVIDIA GPUs
-Patch6016: xserver-1.5.99.902-nouveau.patch
+Patch6016: xserver-1.6.1-nouveau.patch
 
 Patch6022: xserver-1.6.0-primary.patch
 
@@ -544,6 +544,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon May 04 2009 Adam Jackson <ajax at redhat.com> 1.6.1-10
+- xserver-1.6.1-nouveau.patch: Update the autoconfig logic for nv3 and other
+  historical oddities.
+
 * Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 1.6.1-9
 - xserver-1.6.1-avoid-malloc-for-logging.patch: Don't malloc when logging,
   since that makes it unsafe to do from a signal handler.


--- xserver-1.5.99.902-nouveau.patch DELETED ---