rpms/kernel/F-11 drm-radeon-kms-fixes.patch, 1.2, 1.3 kernel.spec, 1.1579, 1.1580

[Dave Airlie]

Author: airlied

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

Modified Files:
	drm-radeon-kms-fixes.patch kernel.spec 
Log Message:
* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-118
- drm-radeon-kms-fixes.patch: revert rs480 snoop break


drm-radeon-kms-fixes.patch:

Index: drm-radeon-kms-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/drm-radeon-kms-fixes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- drm-radeon-kms-fixes.patch	30 Apr 2009 08:16:28 -0000	1.2
+++ drm-radeon-kms-fixes.patch	30 Apr 2009 09:34:25 -0000	1.3
@@ -139,3 +139,21 @@ index 1a5e157..102bdba 100644
 -- 
 1.6.2.2
 
+diff --git a/drivers/gpu/drm/radeon/radeon_cp.c b/drivers/gpu/drm/radeon/radeon_cp.c
+index b349ebe..ac31d0b 100644
+--- a/drivers/gpu/drm/radeon/radeon_cp.c
++++ b/drivers/gpu/drm/radeon/radeon_cp.c
+@@ -1080,11 +1080,9 @@ static void radeon_set_igpgart(drm_radeon_private_t * dev_priv, int on)
+ 		temp |= (upper_32_bits(dev_priv->gart_info.bus_addr) & 0xff) << 4;
+ 		RADEON_WRITE_MCIND(RS480_GART_BASE, temp);
+ 
+-		/* enable snooping on gart mapped address */
+ 		temp = RADEON_READ_MCIND(dev_priv, RS480_AGP_MODE_CNTL);
+-		temp &= (RS480_REQ_TYPE_SNOOP_DIS);
+-		temp |= (1 << RS480_REQ_TYPE_SNOOP_SHIFT);
+-		RADEON_WRITE_MCIND(RS480_AGP_MODE_CNTL, temp);
++		RADEON_WRITE_MCIND(RS480_AGP_MODE_CNTL, ((1 << RS480_REQ_TYPE_SNOOP_SHIFT) |
++							 RS480_REQ_TYPE_SNOOP_DIS));
+ 
+ 		if ((dev_priv->flags & RADEON_FAMILY_MASK) == CHIP_RS690) {
+ 			RADEON_WRITE_MCIND(RS690_MC_AGP_BASE,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1579
retrieving revision 1.1580
diff -u -p -r1.1579 -r1.1580
--- kernel.spec	30 Apr 2009 08:16:28 -0000	1.1579
+++ kernel.spec	30 Apr 2009 09:34:25 -0000	1.1580
@@ -1999,6 +1999,9 @@ fi
 # and build.
 
 %changelog
+* Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-118
+- drm-radeon-kms-fixes.patch: revert rs480 snoop break
+
 * Thu Apr 30 2009 Dave Airlie <airlied at redhat.com> 2.6.29.1-117
 - drm-radeon-kms-fixes.patch: add r300 clip regs