commit 22dd50133ab7548adb23e86c302d6e8b75817e8c
author Alex Deucher <alexdeucher@gmail.com> Sun Dec 06 19:45:17 2009 -0500
committer Dave Airlie <airlied@redhat.com> Tue Dec 08 08:58:33 2009 +1000
tree d4e48f6e4d19aec6f47c4f0c779ed38edb4469f9
parent 2a008d0ccde4ce59a2714e132d5f86a0771e6422

drm/radeon/kms: fix vram setup on rs600/rs690/rs740

Don't remap vram to 0 on IGP chips.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>

drivers/gpu/drm/radeon/rs400.c

diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index 8d12b8a..eda6d757 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -352,7 +352,7 @@
 	u32 tmp;
 
 	/* Setup GPU memory space */
-	tmp = G_00015C_MC_FB_START(RREG32(R_00015C_NB_TOM));
+	tmp = RREG32(R_00015C_NB_TOM);
 	rdev->mc.vram_location = G_00015C_MC_FB_START(tmp) << 16;
 	rdev->mc.gtt_location = 0xFFFFFFFFUL;
 	r = radeon_mc_setup(rdev);