lkml.org 
[lkml]   [2016]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 59/98] drm/amdgpu/pm: update current crtc info after setting the powerstate
    Date
    4.2.8-ckt6 -stable review patch.  If anyone has any objections, please let me know.

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

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

    commit eda1d1cf8d18383f19cd2b752f786120efa4768f 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: Jordan Lazare <Jordan.Lazare@amd.com>
    Acked-by: Christian König <christian.koenig@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
    index c484e22..0924afb 100644
    --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
    +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
    @@ -593,9 +593,6 @@ force:
    /* update display watermarks based on new power state */
    amdgpu_display_bandwidth_update(adev);

    - adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs;
    - adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count;
    -
    /* wait for the rings to drain */
    for (i = 0; i < AMDGPU_MAX_RINGS; i++) {
    struct amdgpu_ring *ring = adev->rings[i];
    @@ -614,6 +611,9 @@ force:
    /* update displays */
    amdgpu_dpm_display_configuration_changed(adev);

    + adev->pm.dpm.current_active_crtcs = adev->pm.dpm.new_active_crtcs;
    + adev->pm.dpm.current_active_crtc_count = adev->pm.dpm.new_active_crtc_count;
    +
    if (adev->pm.funcs->force_performance_level) {
    if (adev->pm.dpm.thermal_active) {
    enum amdgpu_dpm_forced_level level = adev->pm.dpm.forced_level;
    --
    2.7.0
    \
     
     \ /
      Last update: 2016-03-16 01:21    [W:4.087 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site