aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs690.c
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2009-12-06 19:45:17 -0500
committerDave Airlie <airlied@redhat.com>2009-12-07 17:58:33 -0500
commit22dd50133ab7548adb23e86c302d6e8b75817e8c (patch)
treed4e48f6e4d19aec6f47c4f0c779ed38edb4469f9 /drivers/gpu/drm/radeon/rs690.c
parent2a008d0ccde4ce59a2714e132d5f86a0771e6422 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/rs690.c')
-rw-r--r--drivers/gpu/drm/radeon/rs690.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 30913c3b5ba1..eb486ee7ea00 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -162,6 +162,21 @@ void rs690_vram_info(struct radeon_device *rdev)
162 rdev->pm.core_bandwidth.full = rfixed_div(rdev->pm.sclk, a); 162 rdev->pm.core_bandwidth.full = rfixed_div(rdev->pm.sclk, a);
163} 163}
164 164
165static int rs690_mc_init(struct radeon_device *rdev)
166{
167 int r;
168 u32 tmp;
169
170 /* Setup GPU memory space */
171 tmp = RREG32_MC(R_000100_MCCFG_FB_LOCATION);
172 rdev->mc.vram_location = G_000100_MC_FB_START(tmp) << 16;
173 rdev->mc.gtt_location = 0xFFFFFFFFUL;
174 r = radeon_mc_setup(rdev);
175 if (r)
176 return r;
177 return 0;
178}
179
165void rs690_line_buffer_adjust(struct radeon_device *rdev, 180void rs690_line_buffer_adjust(struct radeon_device *rdev,
166 struct drm_display_mode *mode1, 181 struct drm_display_mode *mode1,
167 struct drm_display_mode *mode2) 182 struct drm_display_mode *mode2)
@@ -710,7 +725,7 @@ int rs690_init(struct radeon_device *rdev)
710 /* Get vram informations */ 725 /* Get vram informations */
711 rs690_vram_info(rdev); 726 rs690_vram_info(rdev);
712 /* Initialize memory controller (also test AGP) */ 727 /* Initialize memory controller (also test AGP) */
713 r = r420_mc_init(rdev); 728 r = rs690_mc_init(rdev);
714 if (r) 729 if (r)
715 return r; 730 return r;
716 rv515_debugfs(rdev); 731 rv515_debugfs(rdev);