diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-12-09 14:15:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:25:45 +1000 |
| commit | 550e2d9270e2f0a10c3b063899f70e4cca25fe72 (patch) | |
| tree | 46878bc39515eae9ee1485ce046e16e8e47fda90 /drivers/gpu/drm/radeon/radeon_device.c | |
| parent | 779720a3209849be202ac36a811e934865c50971 (diff) | |
| download | blackbird-op-linux-550e2d9270e2f0a10c3b063899f70e4cca25fe72.tar.gz blackbird-op-linux-550e2d9270e2f0a10c3b063899f70e4cca25fe72.zip | |
drm/radeon/kms: restore surface registers on resume.
On resume on my rv530 laptop surface cntl was left disabled, so
wierd stuff would happen with rendering to a tiled front buffer.
This checks if the surface regs are assigned to bos and reprograms
the surface registers on resume using the same path that clears
them all on init.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_device.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 410859ee112f..02bcdb1240c0 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -44,10 +44,11 @@ void radeon_surface_init(struct radeon_device *rdev) if (rdev->family < CHIP_R600) { int i; - for (i = 0; i < 8; i++) { - WREG32(RADEON_SURFACE0_INFO + - i * (RADEON_SURFACE1_INFO - RADEON_SURFACE0_INFO), - 0); + for (i = 0; i < RADEON_GEM_MAX_SURFACES; i++) { + if (rdev->surface_regs[i].bo) + radeon_bo_get_surface_reg(rdev->surface_regs[i].bo); + else + radeon_clear_surface_reg(rdev, i); } /* enable surfaces */ WREG32(RADEON_SURFACE_CNTL, 0); |
