drm/radeon: fix typo in evergreen_mc_resume()
authorAlex Deucher <alexander.deucher@amd.com>
Mon, 5 Nov 2012 16:34:58 +0000 (16:34 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Fri, 16 Nov 2012 16:46:51 +0000 (16:46 +0000)
commit 695ddeb457584a602f2ba117d08ce37cf6ec1589 upstream.

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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/radeon/evergreen.c

index b61f490..ca94e23 100644 (file)
@@ -1164,7 +1164,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]) {
                        tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
                        tmp &= ~EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE;
                        WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);