---

yaml --- r: 98316 b: refs/heads/master c: 3722bfc h: refs/heads/master v: v3
git-mirror · Jun 19, 2008 · 93257e1 · 93257e1
1 parent ab8d6a2
commit 93257e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa0d71b967506031f7cb08ced6095d1c4f988594
+refs/heads/master: 3722bfc607d46275369865c02fe8694486d640b5
diff --git a/trunk/drivers/char/drm/radeon_cp.c b/trunk/drivers/char/drm/radeon_cp.c
@@ -669,6 +669,8 @@ static void radeon_set_rs690gart(drm_radeon_private_t *dev_priv, int on)
 		RS690_WRITE_MCIND(RS690_MC_AGP_BASE,
 				  (unsigned int)dev_priv->gart_vm_start);
 
+		RS690_WRITE_MCIND(RS690_MC_AGP_BASE_2, 0);
+
 		dev_priv->gart_size = 32*1024*1024;
 		temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) &
 			 0xffff0000) | (dev_priv->gart_vm_start >> 16));

diff --git a/trunk/drivers/char/drm/radeon_drv.h b/trunk/drivers/char/drm/radeon_drv.h
@@ -497,6 +497,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev,
 #define RS690_MC_FB_LOCATION            0x100
 #define RS690_MC_AGP_LOCATION           0x101
 #define RS690_MC_AGP_BASE               0x102
+#define RS690_MC_AGP_BASE_2             0x103
 
 #define R520_MC_IND_INDEX 0x70
 #define R520_MC_IND_WR_EN (1<<24)