lkml.org 
[lkml]   [2016]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.19.y-ckt 44/70] drm/radeon/pm: update current crtc info after setting the powerstate
    Date
    v3.19.8-ckt17 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit 5e031d9fe8b0741f11d49667dfc3ebf5454121fd upstream.

    On CI, we need to see if the number of crtcs changes to determine
    whether or not we need to upload the mclk table again. In practice
    we don't currently upload the mclk table again after the initial load.
    The only reason you would would be to add new states, e.g., for
    arbitrary mclk setting which is not currently supported.

    Acked-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    [ kamal: backport to 4.2-stable: context ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/radeon/radeon_pm.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
    index 5fc27e9..c28e400 100644
    --- a/drivers/gpu/drm/radeon/radeon_pm.c
    +++ b/drivers/gpu/drm/radeon/radeon_pm.c
    @@ -939,10 +939,6 @@ force:
    /* 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;
    -
    /* wait for the rings to drain */
    for (i = 0; i < RADEON_NUM_RINGS; i++) {
    struct radeon_ring *ring = &rdev->ring[i];
    @@ -958,6 +954,10 @@ force:

    radeon_dpm_post_set_power_state(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;
    +
    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-16 22:01    [W:2.553 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site