diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2011-11-10 08:59:39 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-11-11 11:04:18 +0000 |
| commit | 3b9832f662d195755e7308f92368d44458268457 (patch) | |
| tree | 78e0dcd49741640b1d04dbf2a4e15e5b004aca6e /drivers/gpu | |
| parent | 7a1619b97e978bb9c05fa4bbe64171068bd5bf85 (diff) | |
| download | op-kernel-dev-3b9832f662d195755e7308f92368d44458268457.zip op-kernel-dev-3b9832f662d195755e7308f92368d44458268457.tar.gz | |
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 <sylvain.bertrand@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index e4c384b..2e30160 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; |
