aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_device.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2009-07-10 14:44:47 -0400
committerDave Airlie <airlied@redhat.com>2009-07-15 03:13:19 -0400
commit2a0f8918fc34713ecaeb900ffb9afa61df4cb08e (patch)
tree672d6e6788cd0f4100b912aa7029fa38c513a23c /drivers/gpu/drm/radeon/radeon_device.c
parentad49f501867cba87e1e45e5ebae0b12435d68bf1 (diff)
drm/radeon/kms: fix VRAM sizing like DDX does it.
Doing this like the DDX seems like the most sure fire way to avoid having to reinvent it slowly and painfully. At the moment we keep getting things wrong with aper vs vram, so we know the DDX does it right. booted on PCI r100, PCIE rv370, IGP rs400. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_device.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
index 27a5ac969953..cdef6eb01baf 100644
--- a/drivers/gpu/drm/radeon/radeon_device.c
+++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -561,12 +561,7 @@ int radeon_device_init(struct radeon_device *rdev,
561 } 561 }
562 /* Get vram informations */ 562 /* Get vram informations */
563 radeon_vram_info(rdev); 563 radeon_vram_info(rdev);
564 /* Device is severly broken if aper size > vram size. 564
565 * for RN50/M6/M7 - Novell bug 204882 ?
566 */
567 if (rdev->mc.vram_size < rdev->mc.aper_size) {
568 rdev->mc.vram_size = rdev->mc.aper_size;
569 }
570 /* Add an MTRR for the VRAM */ 565 /* Add an MTRR for the VRAM */
571 rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size, 566 rdev->mc.vram_mtrr = mtrr_add(rdev->mc.aper_base, rdev->mc.aper_size,
572 MTRR_TYPE_WRCOMB, 1); 567 MTRR_TYPE_WRCOMB, 1);