From b305b3e19676fa079c3013c02cbc0c22b8e9362f Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 12 Dec 2005 21:41:58 -0800 Subject: [PATCH] --- yaml --- r: 15087 b: refs/heads/master c: b11d0e48aa41b644143ca526ef8d69212fdc1cdd h: refs/heads/master i: 15085: 8801c268daa7bde443c589bfe4fd6c3c8be79c26 15083: d84b8c41a6544419f6f2a408e88f521e3d89c21a 15079: 516182494413a52b66127df19afd6486ff56fdd5 15071: 5946427ca9f2e8885995562d0f604b739be8376b v: v3 --- [refs] | 2 +- trunk/drivers/char/drm/radeon_cp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6235c939b5e4..96f8e8a26621 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfa159886f38344ede31e3b13ec614e0bebc09c6 +refs/heads/master: b11d0e48aa41b644143ca526ef8d69212fdc1cdd diff --git a/trunk/drivers/char/drm/radeon_cp.c b/trunk/drivers/char/drm/radeon_cp.c index 03839ea31092..9f2b4efd0c7a 100644 --- a/trunk/drivers/char/drm/radeon_cp.c +++ b/trunk/drivers/char/drm/radeon_cp.c @@ -1522,7 +1522,7 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) dev_priv->gart_size = init->gart_size; dev_priv->gart_vm_start = dev_priv->fb_location - + RADEON_READ(RADEON_CONFIG_APER_SIZE); + + RADEON_READ(RADEON_CONFIG_APER_SIZE) * 2; #if __OS_HAS_AGP if (!dev_priv->is_pci)