aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-11-05 17:14:32 -0500
committerAlex Deucher <alexander.deucher@amd.com>2014-11-06 17:41:19 -0500
commitf0d7bfb9407fccb6499ec01c33afe43512a439a2 (patch)
treec91e2926bf0e94e3f0905f6d6bf5142f4c5bedcb /drivers/gpu
parentdrm/radeon: use gart for DMA IB tests (diff)
downloadlinux-dev-f0d7bfb9407fccb6499ec01c33afe43512a439a2.tar.xz
linux-dev-f0d7bfb9407fccb6499ec01c33afe43512a439a2.zip
drm/radeon: add missing crtc unlock when setting up the MC
Need to unlock the crtc after updating the blanking state. Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index d1e93ebce446..85995b4e3338 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2555,6 +2555,7 @@ void evergreen_mc_stop(struct radeon_device *rdev, struct evergreen_mc_save *sav
WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;
WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp);
+ WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
}
} else {
tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);