diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-09-18 14:16:38 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-09-18 16:13:11 +1000 |
| commit | 698443d9ec1a33eff65b27b9514e06998bf57eb3 (patch) | |
| tree | c7fed660677470060168d8ab91b67bd6eeae5c4d /drivers/gpu/drm/radeon/r600.c | |
| parent | 5e6dde7ec2e72f49ff749204efc03a59478d7d34 (diff) | |
drm/radeon/kms: disable VGA rendering engine before taking over VRAM
Before we use any of VRAM, we need to disable the VGA rendering
engine, this render text mode into a graphical framebuffer
for scanout, however it does this on vblank, and can end up
overwriting the GART table and r600 shader objects.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 1e1cab5ef1e4..aafdb8edc11d 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -340,6 +340,10 @@ static void r600_mc_resume(struct radeon_device *rdev) WREG32(D1VGA_CONTROL, d1vga_control); WREG32(D2VGA_CONTROL, d2vga_control); WREG32(VGA_RENDER_CONTROL, vga_render_control); + + /* we need to own VRAM, so turn off the VGA renderer here + * to stop it overwriting our objects */ + radeon_avivo_vga_render_disable(rdev); } int r600_mc_init(struct radeon_device *rdev) |