aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-05-28 11:28:27 +1000
committerDave Airlie <airlied@redhat.com>2008-06-19 11:27:39 +1000
commit3722bfc607d46275369865c02fe8694486d640b5 (patch)
tree3398ea00f5878ac1ff3be01364e8b43892c37f08
parentfa0d71b967506031f7cb08ced6095d1c4f988594 (diff)
downloadkernel_samsung_aries-3722bfc607d46275369865c02fe8694486d640b5.zip
kernel_samsung_aries-3722bfc607d46275369865c02fe8694486d640b5.tar.gz
kernel_samsung_aries-3722bfc607d46275369865c02fe8694486d640b5.tar.bz2
drm/rs690: set base 2 to 0.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/char/drm/radeon_cp.c2
-rw-r--r--drivers/char/drm/radeon_drv.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 1e434ba..6e13f4b 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/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/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h
index 173ae62..b22816b 100644
--- a/drivers/char/drm/radeon_drv.h
+++ b/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)