diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2009-12-07 01:45:17 +0100 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-12-07 23:58:33 +0100 |
commit | 22dd50133ab7548adb23e86c302d6e8b75817e8c (patch) | |
tree | d4e48f6e4d19aec6f47c4f0c779ed38edb4469f9 /drivers/gpu/drm/radeon/rs600.c | |
parent | drm/radeon/kms: more r4xx lvds fixes (diff) | |
download | linux-22dd50133ab7548adb23e86c302d6e8b75817e8c.tar.xz linux-22dd50133ab7548adb23e86c302d6e8b75817e8c.zip |
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); int rs600_mc_init(struct radeon_device *rdev) { /* read back the MC value from the hw */ - uint32_t mc_fb_loc; int r; + u32 tmp; - mc_fb_loc = RREG32_MC(R_000004_MC_FB_LOCATION); - rdev->mc.vram_location = G_000004_MC_FB_START(mc_fb_loc) << 16; + /* Setup GPU memory space */ + tmp = RREG32_MC(R_000004_MC_FB_LOCATION); + rdev->mc.vram_location = G_000004_MC_FB_START(tmp) << 16; rdev->mc.gtt_location = 0xffffffffUL; r = radeon_mc_setup(rdev); if (r) |