diff options
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 6af0331cae08..0e791e26def3 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "drmP.h" | 28 | #include "drmP.h" |
29 | #include "radeon_reg.h" | 29 | #include "radeon_reg.h" |
30 | #include "radeon.h" | 30 | #include "radeon.h" |
31 | #include "avivod.h" | ||
31 | 32 | ||
32 | #include "rs600_reg_safe.h" | 33 | #include "rs600_reg_safe.h" |
33 | 34 | ||
@@ -197,6 +198,8 @@ void rs600_mc_disable_clients(struct radeon_device *rdev) | |||
197 | "programming pipes. Bad things might happen.\n"); | 198 | "programming pipes. Bad things might happen.\n"); |
198 | } | 199 | } |
199 | 200 | ||
201 | radeon_avivo_vga_render_disable(rdev); | ||
202 | |||
200 | tmp = RREG32(AVIVO_D1VGA_CONTROL); | 203 | tmp = RREG32(AVIVO_D1VGA_CONTROL); |
201 | WREG32(AVIVO_D1VGA_CONTROL, tmp & ~AVIVO_DVGA_CONTROL_MODE_ENABLE); | 204 | WREG32(AVIVO_D1VGA_CONTROL, tmp & ~AVIVO_DVGA_CONTROL_MODE_ENABLE); |
202 | tmp = RREG32(AVIVO_D2VGA_CONTROL); | 205 | tmp = RREG32(AVIVO_D2VGA_CONTROL); |