rpms/xorg-x11-server/F-11 xorg-x11-server.spec, 1.450, 1.451 xserver-1.6.1-nouveau.patch, 1.2, 1.3

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-nouveau.patch 
Log Message:
fix detection of early nvidia chipsets



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xorg-x11-server.spec,v
retrieving revision 1.450
retrieving revision 1.451
diff -u -p -r1.450 -r1.451
--- xorg-x11-server.spec	9 Jun 2009 05:54:14 -0000	1.450
+++ xorg-x11-server.spec	11 Jun 2009 05:40:28 -0000	1.451
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.1.901
-Release:   4%{?dist}
+Release:   5%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -536,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 11 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.1.901-5
+- xserver-1.6.1-nouveau.patch: fix detection of earlier chipsets
+
 * Tue Jun 09 2009 Dave Airlie <airlied at redhat.com> 1.6.1.901-4
 - backport a GLX drawable fixes
 

xserver-1.6.1-nouveau.patch:

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-11/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xserver-1.6.1-nouveau.patch	7 May 2009 14:01:24 -0000	1.2
+++ xserver-1.6.1-nouveau.patch	11 Jun 2009 05:40:29 -0000	1.3
@@ -78,19 +78,16 @@ diff --git a/hw/xfree86/common/xf86AutoC
 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,
+@@ -181,7 +181,31 @@ 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) {
++	    switch (dev->device_id) {
 +	    /* NV1 */
 +	    case 0x0008:
 +	    case 0x0009:
-+	    /* Non-functional with both nouveau and nv */
-+	    case 0x0840:
-+	    case 0x0860:
 +		driverList[0] = "vesa";
 +		break;
 +	    /* NV3 */
@@ -99,10 +96,18 @@ index 19c06c8..e40551e 100644
 +		driverList[0] = "nv";
 +		break;
 +	    default:
-+		driverList[0] = "nouveau";
++		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;
 +	    }
-+	    break;
  	case 0x1163:		    driverList[0] = "rendition"; break;
  	case 0x5333:
  	    switch (dev->device_id)