From: Alex Deucher Date: Thu, 10 Nov 2011 13:59:39 +0000 (-0500) Subject: drm/radeon/kms: fix use of vram scratch page on evergreen/ni X-Git-Tag: next-20111114~95^2~15 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=3b9832f662d195755e7308f92368d44458268457;p=karo-tx-linux.git drm/radeon/kms: fix use of vram scratch page on evergreen/ni This hunk seems to have gotten lost when I rebased the patch. Reported-by: Sylvain Bertrand Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie --- diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index e4c384b9511c..2e30160687c8 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1219,7 +1219,7 @@ void evergreen_mc_program(struct radeon_device *rdev) WREG32(MC_VM_SYSTEM_APERTURE_HIGH_ADDR, rdev->mc.vram_end >> 12); } - WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, 0); + WREG32(MC_VM_SYSTEM_APERTURE_DEFAULT_ADDR, rdev->vram_scratch.gpu_addr >> 12); if (rdev->flags & RADEON_IS_IGP) { tmp = RREG32(MC_FUS_VM_FB_OFFSET) & 0x000FFFFF; tmp |= ((rdev->mc.vram_end >> 20) & 0xF) << 24;