]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/radeon: fix reversed logic in evergreen_mc_resume
authorAlex Deucher <alexander.deucher@amd.com>
Wed, 30 Jul 2014 21:57:28 +0000 (17:57 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 5 Aug 2014 12:53:43 +0000 (08:53 -0400)
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 <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/evergreen.c

index 27ebaaa88d895203c2940a11f8ed6a9503441f18..cb2043973583f6c2d8602021902e447a1154f1be 100644 (file)
@@ -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);