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/rs600.c | |
| parent | 5e6dde7ec2e72f49ff749204efc03a59478d7d34 (diff) | |
| download | op-kernel-dev-698443d9ec1a33eff65b27b9514e06998bf57eb3.zip op-kernel-dev-698443d9ec1a33eff65b27b9514e06998bf57eb3.tar.gz | |
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/rs600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/rs600.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 6af0331..0e791e26 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c @@ -28,6 +28,7 @@ #include "drmP.h" #include "radeon_reg.h" #include "radeon.h" +#include "avivod.h" #include "rs600_reg_safe.h" @@ -197,6 +198,8 @@ void rs600_mc_disable_clients(struct radeon_device *rdev) "programming pipes. Bad things might happen.\n"); } + radeon_avivo_vga_render_disable(rdev); + tmp = RREG32(AVIVO_D1VGA_CONTROL); WREG32(AVIVO_D1VGA_CONTROL, tmp & ~AVIVO_DVGA_CONTROL_MODE_ENABLE); tmp = RREG32(AVIVO_D2VGA_CONTROL); |
