mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
drm/amd/pp: delete repeated call of force_dpm_level
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
582dd5da5c
commit
8621bbbbd3
3 changed files with 6 additions and 10 deletions
|
@ -389,20 +389,12 @@ static int pp_dpm_force_performance_level(void *handle,
|
|||
if (level == hwmgr->dpm_level)
|
||||
return 0;
|
||||
|
||||
if (hwmgr->hwmgr_func->force_dpm_level == NULL) {
|
||||
pr_info("%s was not implemented.\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
mutex_lock(&pp_handle->pp_lock);
|
||||
pp_dpm_en_umd_pstate(hwmgr, &level);
|
||||
hwmgr->request_dpm_level = level;
|
||||
hwmgr_handle_task(pp_handle, AMD_PP_TASK_READJUST_POWER_STATE, NULL, NULL);
|
||||
ret = hwmgr->hwmgr_func->force_dpm_level(hwmgr, level);
|
||||
if (!ret)
|
||||
hwmgr->dpm_level = hwmgr->request_dpm_level;
|
||||
|
||||
mutex_unlock(&pp_handle->pp_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -149,6 +149,7 @@ int hwmgr_early_init(struct pp_instance *handle)
|
|||
hwmgr->power_source = PP_PowerSource_AC;
|
||||
hwmgr->pp_table_version = PP_TABLE_V1;
|
||||
hwmgr->dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;
|
||||
hwmgr->request_dpm_level = AMD_DPM_FORCED_LEVEL_AUTO;
|
||||
hwmgr_init_default_caps(hwmgr);
|
||||
hwmgr_set_user_specify_caps(hwmgr);
|
||||
hwmgr->fan_ctrl_is_in_default_mode = true;
|
||||
|
|
|
@ -244,8 +244,11 @@ int psm_adjust_power_state_dynamic(struct pp_hwmgr *hwmgr, bool skip,
|
|||
}
|
||||
|
||||
phm_notify_smc_display_config_after_ps_adjustment(hwmgr);
|
||||
phm_force_dpm_levels(hwmgr, hwmgr->dpm_level);
|
||||
if (!phm_force_dpm_levels(hwmgr, hwmgr->request_dpm_level))
|
||||
hwmgr->dpm_level = hwmgr->request_dpm_level;
|
||||
|
||||
phm_reset_power_profile_state(hwmgr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue