lkml.org 
[lkml]   [2016]   [Mar]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 134/196] drm/radeon/pm: adjust display configuration after powerstate
    Date
    3.19.8-ckt16 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 39d4275058baf53e89203407bf3841ff2c74fa32 upstream.

    set_power_state defaults to no displays, so we need to update
    the display configuration after setting up the powerstate on the
    first call. In most cases this is not an issue since ends up
    getting called multiple times at any given modeset and the proper
    order is achieved in the display changed handling at the top of
    the function.

    Reviewed-by: Christian König <christian.koenig@amd.com>
    Acked-by: Jordan Lazare <Jordan.Lazare@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/radeon/radeon_pm.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

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

    /* update display watermarks based on new power state */
    radeon_bandwidth_update(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;
    @@ -958,6 +956,9 @@ force:

    radeon_dpm_post_set_power_state(rdev);

    + /* update displays */
    + radeon_dpm_display_configuration_changed(rdev);
    +
    if (rdev->asic->dpm.force_performance_level) {
    if (rdev->pm.dpm.thermal_active) {
    enum radeon_dpm_forced_level level = rdev->pm.dpm.forced_level;
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-09 02:41    [W:4.116 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site