diff options
author | Dave Airlie <airlied@linux.ie> | 2008-05-27 21:28:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-06-18 21:27:39 -0400 |
commit | 3722bfc607d46275369865c02fe8694486d640b5 (patch) | |
tree | 3398ea00f5878ac1ff3be01364e8b43892c37f08 | |
parent | fa0d71b967506031f7cb08ced6095d1c4f988594 (diff) |
drm/rs690: set base 2 to 0.
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/char/drm/radeon_cp.c | 2 | ||||
-rw-r--r-- | drivers/char/drm/radeon_drv.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 1e434ba15564..6e13f4bec917 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) | |||
669 | RS690_WRITE_MCIND(RS690_MC_AGP_BASE, | 669 | RS690_WRITE_MCIND(RS690_MC_AGP_BASE, |
670 | (unsigned int)dev_priv->gart_vm_start); | 670 | (unsigned int)dev_priv->gart_vm_start); |
671 | 671 | ||
672 | RS690_WRITE_MCIND(RS690_MC_AGP_BASE_2, 0); | ||
673 | |||
672 | dev_priv->gart_size = 32*1024*1024; | 674 | dev_priv->gart_size = 32*1024*1024; |
673 | temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) & | 675 | temp = (((dev_priv->gart_vm_start - 1 + dev_priv->gart_size) & |
674 | 0xffff0000) | (dev_priv->gart_vm_start >> 16)); | 676 | 0xffff0000) | (dev_priv->gart_vm_start >> 16)); |
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 173ae620223a..b22816b57659 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, | |||
497 | #define RS690_MC_FB_LOCATION 0x100 | 497 | #define RS690_MC_FB_LOCATION 0x100 |
498 | #define RS690_MC_AGP_LOCATION 0x101 | 498 | #define RS690_MC_AGP_LOCATION 0x101 |
499 | #define RS690_MC_AGP_BASE 0x102 | 499 | #define RS690_MC_AGP_BASE 0x102 |
500 | #define RS690_MC_AGP_BASE_2 0x103 | ||
500 | 501 | ||
501 | #define R520_MC_IND_INDEX 0x70 | 502 | #define R520_MC_IND_INDEX 0x70 |
502 | #define R520_MC_IND_WR_EN (1<<24) | 503 | #define R520_MC_IND_WR_EN (1<<24) |