rpms/xorg-x11-server/devel xorg-x11-server.spec, 1.476, 1.477 xserver-1.6.1-nouveau.patch, 1.1, 1.2

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	xorg-x11-server.spec xserver-1.6.1-nouveau.patch 
Log Message:
* Mon Aug 24 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.99-40.20090820
- xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
  should work on them now, there's accel issues on some of them but we can
  fallback to shadowfb in the driver and keep KMS support.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.476
retrieving revision 1.477
diff -u -p -r1.476 -r1.477
--- xorg-x11-server.spec	21 Aug 2009 18:33:32 -0000	1.476
+++ xorg-x11-server.spec	24 Aug 2009 05:05:49 -0000	1.477
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99
-Release:   39.%{gitdate}%{?dist}
+Release:   40.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -507,6 +507,11 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Mon Aug 24 2009 Ben Skeggs <bskeggs at redhat.com> 1.6.99-40.20090820
+- xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS
+  should work on them now, there's accel issues on some of them but we can
+  fallback to shadowfb in the driver and keep KMS support.
+
 * Fri Aug 21 2009 Adam Jackson <ajax at redhat.com> 1.6.99-39.20090820
 - xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if
   the driver returned real modes (and has no EDID).

xserver-1.6.1-nouveau.patch:
 glx/glxdri.c                       |    7 +++++--
 glx/glxdri2.c                      |    7 +++++--
 hw/xfree86/common/xf86AutoConfig.c |   19 +++++++++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

Index: xserver-1.6.1-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.1-nouveau.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.1-nouveau.patch	23 Jun 2009 04:02:10 -0000	1.1
+++ xserver-1.6.1-nouveau.patch	24 Aug 2009 05:05:49 -0000	1.2
@@ -78,7 +78,7 @@ diff --git a/hw/xfree86/common/xf86AutoC
 index bc4c80b..d8fa80f 100644
 --- a/hw/xfree86/common/xf86AutoConfig.c
 +++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -180,7 +180,32 @@ videoPtrToDriverList(struct pci_device *dev,
+@@ -180,7 +180,23 @@ videoPtrToDriverList(struct pci_device *dev,
  	    break;
  	case 0x102b:		    driverList[0] = "mga";	break;
  	case 0x10c8:		    driverList[0] = "neomagic"; break;
@@ -96,16 +96,7 @@ index bc4c80b..d8fa80f 100644
 +		driverList[0] = "nv";
 +		break;
 +	    default:
-+		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;
-+		}
++		driverList[0] = "nouveau";
 +		break;
 +	    }
 +	    break;