From: Alex Deucher Date: Wed, 30 Jul 2014 21:57:28 +0000 (-0400) Subject: drm/radeon: fix reversed logic in evergreen_mc_resume X-Git-Tag: android-x86-4.4-r2~688^2~6^2~25 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3157c5897212997da27ea1a641a246f2a1808cff;p=android-x86%2Fkernel.git drm/radeon: fix reversed logic in evergreen_mc_resume Need to unblank the display when resuming the MC. No functional change as this code path is not currently hit. We always disable the displays entirely rather than just blanking them. Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 27ebaaa88d89..cb2043973583 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2676,7 +2676,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s if (save->crtc_enabled[i]) { if (ASIC_IS_DCE6(rdev)) { tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]); - tmp |= EVERGREEN_CRTC_BLANK_DATA_EN; + tmp &= ~EVERGREEN_CRTC_BLANK_DATA_EN; WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1); WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp); WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);