OSDN Git Service

step back one reported bugs against that patch
authorDave Airlie <airlied@linux.ie>
Wed, 28 Dec 2005 22:36:51 +0000 (22:36 +0000)
committerDave Airlie <airlied@linux.ie>
Wed, 28 Dec 2005 22:36:51 +0000 (22:36 +0000)
shared-core/radeon_cp.c

index 503fe8e..673d20d 100644 (file)
@@ -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)