rpms/kernel/F-11 drm-nouveau.patch, 1.54, 1.55 kernel.spec, 1.1660, 1.1661

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3671

Modified Files:
	drm-nouveau.patch kernel.spec 
Log Message:
* Mon Jun 26 2009 Ben Skeggs <bskeggs at redhat.com>
- nouveau: fix GT200 context control, will allow use of 3D engine now



drm-nouveau.patch:

Index: drm-nouveau.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-nouveau.patch,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- drm-nouveau.patch	18 Jun 2009 00:26:55 -0000	1.54
+++ drm-nouveau.patch	29 Jun 2009 03:03:13 -0000	1.55
@@ -27067,9 +27067,9 @@ index 0000000..1832c3f
 +
 +	INSTANCE_WR(ctx, 0x00000/4, chan->ramin->instance >> 12);
 +	if ((dev_priv->chipset & 0xf0) == 0xa0)
-+		INSTANCE_WR(ctx, 0x00004/4, 0x00000002);
++		INSTANCE_WR(ctx, 0x00004/4, 0x00000000);
 +	else
-+		INSTANCE_WR(ctx, 0x0011c/4, 0x00000002);
++		INSTANCE_WR(ctx, 0x0011c/4, 0x00000000);
 +
 +	dev_priv->engine.instmem.finish_access(dev);
 +


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1660
retrieving revision 1.1661
diff -u -p -r1.1660 -r1.1661
--- kernel.spec	25 Jun 2009 02:10:33 -0000	1.1660
+++ kernel.spec	29 Jun 2009 03:03:13 -0000	1.1661
@@ -2073,6 +2073,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jun 26 2009 Ben Skeggs <bskeggs at redhat.com>
+- nouveau: fix GT200 context control, will allow use of 3D engine now
+
 * Wed Jun 24 2009 Jarod Wilson <jarod at redhat.com> 2.6.29.5-198
 - Fix lirc_i2c functionality (#507047)
 - Add ability to disable lirc_imon mouse mode