diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2010-12-15 11:04:10 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-12-15 23:55:45 -0500 |
commit | b4183e301ac1dfaf93e3e92fd70a0c3203c5a27d (patch) | |
tree | 377d9567ac04f79717fc9b58cdfd84b5f0bc21fa /drivers/gpu/drm/radeon/evergreen.c | |
parent | ca9693a17368041dd5416b0f1f93daaf7a5a5308 (diff) |
drm/radeon/kms: fix vram start calculation on ontario (v2)
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen.c')
-rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 522d29b37007..f7d7477daffb 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
@@ -1134,6 +1134,12 @@ static void evergreen_mc_program(struct radeon_device *rdev) | |||
1134 | rdev->mc.vram_end >> 12); | 1134 | rdev->mc.vram_end >> 12); |
1135 | } | 1135 | } |
1136 | WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, 0); | 1136 | WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, 0); |
1137 | if (rdev->flags & RADEON_IS_IGP) { | ||
1138 | tmp = RREG32(MC_FUS_VM_FB_OFFSET) & 0x000FFFFF; | ||
1139 | tmp |= ((rdev->mc.vram_end >> 20) & 0xF) << 24; | ||
1140 | tmp |= ((rdev->mc.vram_start >> 20) & 0xF) << 20; | ||
1141 | WREG32(MC_FUS_VM_FB_OFFSET, tmp); | ||
1142 | } | ||
1137 | tmp = ((rdev->mc.vram_end >> 24) & 0xFFFF) << 16; | 1143 | tmp = ((rdev->mc.vram_end >> 24) & 0xFFFF) << 16; |
1138 | tmp |= ((rdev->mc.vram_start >> 24) & 0xFFFF); | 1144 | tmp |= ((rdev->mc.vram_start >> 24) & 0xFFFF); |
1139 | WREG32(MC_VM_FB_LOCATION, tmp); | 1145 | WREG32(MC_VM_FB_LOCATION, tmp); |