lkml.org 
[lkml]   [2018]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 36/73] drm/amd/powerplay: issue pre-display settings for display change event
    Date
    From: Evan Quan <evan.quan@amd.com>

    [ Upstream commit 10cb3e6b63bf4266a5198813526fdd7259ffb8be ]

    For display config change event only, pre-display config settings are
    needed.

    Signed-off-by: Evan Quan <evan.quan@amd.com>
    Acked-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 +++
    drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 2 --
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
    index 8994aa5c8cf8..64596029b696 100644
    --- a/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
    +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c
    @@ -365,6 +365,9 @@ int hwmgr_handle_task(struct pp_hwmgr *hwmgr, enum amd_pp_task task_id,

    switch (task_id) {
    case AMD_PP_TASK_DISPLAY_CONFIG_CHANGE:
    + ret = phm_pre_display_configuration_changed(hwmgr);
    + if (ret)
    + return ret;
    ret = phm_set_cpu_power_state(hwmgr);
    if (ret)
    return ret;
    diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
    index 91ffb7bc4ee7..56437866d120 100644
    --- a/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
    +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c
    @@ -265,8 +265,6 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
    if (skip)
    return 0;

    - phm_pre_display_configuration_changed(hwmgr);
    -
    phm_display_configuration_changed(hwmgr);

    if (hwmgr->ps)
    --
    2.19.1
    \
     
     \ /
      Last update: 2018-12-13 05:50    [W:4.148 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site