lkml.org 
[lkml]   [2013]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 53/73] drm/radeon: disable the crtcs in mc_stop (evergreen+) (v2)
    Date
    3.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Alex Deucher <alexander.deucher@amd.com>

    commit abf1457bbbe4c62066bd03c6d31837dea28644dc upstream.

    Just disabling the mem requests should be enough, but
    that doesn't seem to work correctly on efi systems.

    May fix:
    https://bugs.freedesktop.org/show_bug.cgi?id=57567
    https://bugs.freedesktop.org/show_bug.cgi?id=43655
    https://bugzilla.kernel.org/show_bug.cgi?id=56441

    v2: blank displays first, then disable.

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/radeon/evergreen.c | 12 ++++++++++++
    1 file changed, 12 insertions(+)

    --- a/drivers/gpu/drm/radeon/evergreen.c
    +++ b/drivers/gpu/drm/radeon/evergreen.c
    @@ -1353,6 +1353,7 @@ void evergreen_mc_stop(struct radeon_dev
    tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]);
    if (!(tmp & EVERGREEN_CRTC_BLANK_DATA_EN)) {
    radeon_wait_for_vblank(rdev, i);
    + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
    tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;
    WREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i], tmp);
    }
    @@ -1360,8 +1361,10 @@ void evergreen_mc_stop(struct radeon_dev
    tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
    if (!(tmp & EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE)) {
    radeon_wait_for_vblank(rdev, i);
    + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
    tmp |= EVERGREEN_CRTC_DISP_READ_REQUEST_DISABLE;
    WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);
    + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
    }
    }
    /* wait for the next frame */
    @@ -1371,6 +1374,15 @@ void evergreen_mc_stop(struct radeon_dev
    break;
    udelay(1);
    }
    +
    + /* XXX this is a hack to avoid strange behavior with EFI on certain systems */
    + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 1);
    + tmp = RREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i]);
    + tmp &= ~EVERGREEN_CRTC_MASTER_EN;
    + WREG32(EVERGREEN_CRTC_CONTROL + crtc_offsets[i], tmp);
    + WREG32(EVERGREEN_CRTC_UPDATE_LOCK + crtc_offsets[i], 0);
    + save->crtc_enabled[i] = false;
    + /* ***** */
    } else {
    save->crtc_enabled[i] = false;
    }



    \
     
     \ /
      Last update: 2013-05-10 02:21    [W:4.130 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site