summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2005-12-28 22:36:51 +0000
committerDave Airlie <airlied@linux.ie>2005-12-28 22:36:51 +0000
commit4c988520a851ed42c1dd9e9f7cda2e79f5a23fc7 (patch)
tree1655b7e0b1dd84477cdd75a07e6efaf90e9f55bb
parent274fdf482ba5b33167213f76e6c17943ddf51985 (diff)
step back one reported bugs against that patch
-rw-r--r--shared-core/radeon_cp.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 503fe8ef..673d20de 100644
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -1306,7 +1306,6 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
{
drm_radeon_private_t *dev_priv = dev->dev_private;
- unsigned int mem_size;
DRM_DEBUG("\n");
@@ -1505,11 +1504,7 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
dev_priv->gart_size = init->gart_size;
- mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE);
- if (mem_size == 0)
- mem_size = 0x800000;
-
- dev_priv->gart_vm_start = dev_priv->fb_location + mem_size;
+ dev_priv->gart_vm_start = dev_priv->fb_location + RADEON_READ(RADEON_CONFIG_APER_SIZE);
#if __OS_HAS_AGP
if (dev_priv->flags & CHIP_IS_AGP)