From c30471c7eb49d98f4c224a1b3060f7cb773e4900 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Tue, 29 Jan 2013 16:56:16 -0500 Subject: [PATCH] drm/radeon: fix MC blackout on r5xx-r7xx (v3) Seems we miss the update in certain conditions. Wait for the update pending bit to clear in addition to waiting for the next frame. v3: wait for pending bit to clear in addition to waiting for the next frame. Reported-by: Shuah Khan Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/r500_reg.h | 2 ++ drivers/gpu/drm/radeon/rv515.c | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/r500_reg.h b/drivers/gpu/drm/radeon/r500_reg.h index ec576aa..4fbabde 100644 --- a/drivers/gpu/drm/radeon/r500_reg.h +++ b/drivers/gpu/drm/radeon/r500_reg.h @@ -358,6 +358,8 @@ #define AVIVO_D1CRTC_STEREO_CONTROL 0x60c4 #define AVIVO_D1MODE_MASTER_UPDATE_MODE 0x60e4 +#define AVIVO_D1CRTC_UPDATE_LOCK 0x60e8 +#define AVIVO_D1CRTC_DOUBLE_BUFFER_CONTROL 0x60ec /* master controls */ #define AVIVO_DC_CRTC_MASTER_EN 0x60f8 diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index 2bb6d0e..7a0ce53 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -309,7 +309,8 @@ void rv515_mc_stop(struct radeon_device *rdev, struct rv515_mc_save *save) /* wait for the next frame */ frame_count = radeon_get_vblank_counter(rdev, i); for (j = 0; j < rdev->usec_timeout; j++) { - if (radeon_get_vblank_counter(rdev, i) != frame_count) + if ((radeon_get_vblank_counter(rdev, i) != frame_count) && + (!(RREG32(AVIVO_D1CRTC_DOUBLE_BUFFER_CONTROL + crtc_offsets[i]) & 1))) break; udelay(1); } @@ -388,7 +389,8 @@ void rv515_mc_resume(struct radeon_device *rdev, struct rv515_mc_save *save) /* wait for the next frame */ frame_count = radeon_get_vblank_counter(rdev, i); for (j = 0; j < rdev->usec_timeout; j++) { - if (radeon_get_vblank_counter(rdev, i) != frame_count) + if ((radeon_get_vblank_counter(rdev, i) != frame_count) && + (!(RREG32(AVIVO_D1CRTC_DOUBLE_BUFFER_CONTROL + crtc_offsets[i]) & 1))) break; udelay(1); } -- 1.7.7.5