lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 123/142] Revert "drm/radeon/pm: adjust display configuration after powerstate"
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

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

    commit d74e766e1916d0e09b86e4b5b9d0f819628fd546 upstream.

    This reverts commit 39d4275058baf53e89203407bf3841ff2c74fa32.

    This caused a regression on some older hardware.

    bug:
    https://bugzilla.kernel.org/show_bug.cgi?id=113891

    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/radeon/radeon_pm.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
    index a05d569fa038..afd4adaf9f2d 100644
    --- a/drivers/gpu/drm/radeon/radeon_pm.c
    +++ b/drivers/gpu/drm/radeon/radeon_pm.c
    @@ -936,6 +936,8 @@ force:

    /* update display watermarks based on new power state */
    radeon_bandwidth_update(rdev);
    + /* update displays */
    + radeon_dpm_display_configuration_changed(rdev);

    /* wait for the rings to drain */
    for (i = 0; i < RADEON_NUM_RINGS; i++) {
    @@ -952,9 +954,6 @@ force:

    radeon_dpm_post_set_power_state(rdev);

    - /* update displays */
    - radeon_dpm_display_configuration_changed(rdev);
    -
    rdev->pm.dpm.current_active_crtcs = rdev->pm.dpm.new_active_crtcs;
    rdev->pm.dpm.current_active_crtc_count = rdev->pm.dpm.new_active_crtc_count;
    rdev->pm.dpm.single_display = single_display;
    \
     
     \ /
      Last update: 2016-03-22 12:41    [W:4.649 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site