aboutsummaryrefslogtreecommitdiff
path: root/drivers/char/drm/radeon_cp.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-12-30 00:35:53 -0500
committerLen Brown <len.brown@intel.com>2005-12-30 00:35:53 -0500
commitc1a959d8ef4e343f11c8c0f9a693815b6dc76886 (patch)
treebc5630e668d1e3d08c71091d17d011dd0468c71b /drivers/char/drm/radeon_cp.c
parent6968e50c2b53805219618203db3d98566dfa1fdd (diff)
parent9e625ff8a37aefcc177b19614ffcffb5bc6eeea1 (diff)
Pull linus into release branch
Diffstat (limited to 'drivers/char/drm/radeon_cp.c')
-rw-r--r--drivers/char/drm/radeon_cp.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index b517ae51580..342302d4674 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1312,8 +1312,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, aper_size;
-
DRM_DEBUG("\n");
dev_priv->is_pci = init->is_pci;
@@ -1523,13 +1521,8 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
+ dev_priv->fb_location) >> 10));
dev_priv->gart_size = init->gart_size;
-
- mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE);
- if (mem_size == 0)
- mem_size = 0x800000;
- aper_size = max(RADEON_READ(RADEON_CONFIG_APER_SIZE), mem_size);
-
- dev_priv->gart_vm_start = dev_priv->fb_location + aper_size;
+ dev_priv->gart_vm_start = dev_priv->fb_location
+ + RADEON_READ(RADEON_CONFIG_APER_SIZE);
#if __OS_HAS_AGP
if (!dev_priv->is_pci)