summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-11-05 16:34:58 +0000
committerDave Airlie <airlied@redhat.com>2012-11-07 10:53:49 +1000
commit695ddeb457584a602f2ba117d08ce37cf6ec1589 (patch)
tree73b6a7b4e710646c32c001ea4f8ec59678039e04
parentfdb40a08ef7bc970899c3a1f471165f9c22763a1 (diff)
downloadlinux-3.10-695ddeb457584a602f2ba117d08ce37cf6ec1589.tar.gz
linux-3.10-695ddeb457584a602f2ba117d08ce37cf6ec1589.tar.bz2
linux-3.10-695ddeb457584a602f2ba117d08ce37cf6ec1589.zip
drm/radeon: fix typo in evergreen_mc_resume()
Add missing index that may have led us to enabling more crtcs than necessary. May also fix: https://bugs.freedesktop.org/show_bug.cgi?id=56139 Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index 14313ad43b7..af31f829f4a 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -1372,7 +1372,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s
WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN);
for (i = 0; i < rdev->num_crtc; i++) {
- if (save->crtc_enabled) {
+ 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;