diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-06 19:45:17 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-07 17:58:33 -0500 |
commit | 22dd50133ab7548adb23e86c302d6e8b75817e8c (patch) | |
tree | d4e48f6e4d19aec6f47c4f0c779ed38edb4469f9 /drivers/gpu/drm/radeon/rs600.c | |
parent | 2a008d0ccde4ce59a2714e132d5f86a0771e6422 (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/rs600.c')
-rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 3be456b78191..84b26376027d 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -48,11 +48,12 @@ int rs600_mc_wait_for_idle(struct radeon_device *rdev); | |||
48 | int rs600_mc_init(struct radeon_device *rdev) | 48 | int rs600_mc_init(struct radeon_device *rdev) |
49 | { | 49 | { |
50 | /* read back the MC value from the hw */ | 50 | /* read back the MC value from the hw */ |
51 | uint32_t mc_fb_loc; | ||
52 | int r; | 51 | int r; |
52 | u32 tmp; | ||
53 | 53 | ||
54 | mc_fb_loc = RREG32_MC(R_000004_MC_FB_LOCATION); | 54 | /* Setup GPU memory space */ |
55 | rdev->mc.vram_location = G_000004_MC_FB_START(mc_fb_loc) << 16; | 55 | tmp = RREG32_MC(R_000004_MC_FB_LOCATION); |
56 | rdev->mc.vram_location = G_000004_MC_FB_START(tmp) << 16; | ||
56 | rdev->mc.gtt_location = 0xffffffffUL; | 57 | rdev->mc.gtt_location = 0xffffffffUL; |
57 | r = radeon_mc_setup(rdev); | 58 | r = radeon_mc_setup(rdev); |
58 | if (r) | 59 | if (r) |