drm/amd/powerplay: add lock protection for swSMU APIs V2
Subsystems (3)
PATCH 1/3 drm/amd/powerplay: add lock protection for swSMU APIs V2
This is a quick and low risk fix. Those APIs which are exposed to other IPs or to support sysfs/hwmon interfaces or DAL will have lock protection. Meanwhile no lock protection is enforced for swSMU internal used APIs. Future optimization is needed.
V2: strip the lock protection for all swSMU internal APIs
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 23 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 696 ++++++++++++++++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 3 - .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 163 ++-- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 15 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 14 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 22 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 3 - drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 20 +- 12 files changed, 777 insertions(+), 198 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +4 -2
@@ -912,7 +912,8 @@ int amdgpu_dpm_get_sclk(struct amdgpu_device *adev, bool low)if (is_support_sw_smu (adev)) { ret =smu_get_dpm_freq_range (&adev->smu,SMU_GFXCLK , low ? &clk_freq :NULL , - !low ? &clk_freq :NULL ); + !low ? &clk_freq :NULL , + true);if (ret)return 0 ;return clk_freq *100 ;
@@ -930,7 +931,8 @@ int amdgpu_dpm_get_mclk(struct amdgpu_device *adev, bool low)if (is_support_sw_smu (adev)) { ret =smu_get_dpm_freq_range (&adev->smu,SMU_UCLK , low ? &clk_freq :NULL , - !low ? &clk_freq :NULL ); + !low ? &clk_freq :NULL , + true);if (ret)return 0 ;return clk_freq *100 ;
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +0 -6
@@ -298,12 +298,6 @@ enum amdgpu_pcie_gen {#define amdgpu_dpm_get_current_power_state (adev) \ ((adev)->powerplay.pp_funcs->get_current_power_state((adev)->powerplay.pp_handle)) -#define amdgpu_smu_get_current_power_state (adev) \ - ((adev)->smu.ppt_funcs->get_current_power_state(&((adev)->smu))) - -#define amdgpu_smu_set_power_state (adev) \ - ((adev)->smu.ppt_funcs->set_power_state(&((adev)->smu))) -#define amdgpu_dpm_get_pp_num_states (adev, data) \ ((adev)->powerplay.pp_funcs->get_pp_num_states((adev)->powerplay.pp_handle, data))
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +12 -11
@@ -211,7 +211,7 @@ static ssize_t amdgpu_get_dpm_state(struct device *dev,if (is_support_sw_smu (adev)) {if (adev->smu.ppt_funcs->get_current_power_state) - pm =amdgpu_smu_get_current_power_state (adev); + pm =smu_get_current_power_state (&adev->smu);else pm = adev->pm.dpm.user_state; }else if (adev->powerplay.pp_funcs->get_current_power_state) {
@@ -957,7 +957,7 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_SCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_SCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level) ret =amdgpu_dpm_force_clock_level (adev,PP_SCLK , mask);
@@ -1004,7 +1004,7 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_MCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_MCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level) ret =amdgpu_dpm_force_clock_level (adev,PP_MCLK , mask);
@@ -1044,7 +1044,7 @@ static ssize_t amdgpu_set_pp_dpm_socclk(struct device *dev,return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_SOCCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_SOCCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level) ret =amdgpu_dpm_force_clock_level (adev,PP_SOCCLK , mask);
@@ -1084,7 +1084,7 @@ static ssize_t amdgpu_set_pp_dpm_fclk(struct device *dev,return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_FCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_FCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level) ret =amdgpu_dpm_force_clock_level (adev,PP_FCLK , mask);
@@ -1124,7 +1124,7 @@ static ssize_t amdgpu_set_pp_dpm_dcefclk(struct device *dev,return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_DCEFCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_DCEFCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level) ret =amdgpu_dpm_force_clock_level (adev,PP_DCEFCLK , mask);
@@ -1164,7 +1164,7 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev,return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_PCIE , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_PCIE , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level) ret =amdgpu_dpm_force_clock_level (adev,PP_PCIE , mask);
@@ -1356,7 +1356,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, } parameter[parameter_size] = profile_mode;if (is_support_sw_smu (adev)) - ret =smu_set_power_profile_mode (&adev->smu, parameter, parameter_size); + ret =smu_set_power_profile_mode (&adev->smu, parameter, parameter_size, true);else if (adev->powerplay.pp_funcs->set_power_profile_mode) ret =amdgpu_dpm_set_power_profile_mode (adev, parameter, parameter_size);if (!ret)
@@ -2065,7 +2065,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev,uint32_t limit =0 ;if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, true); +smu_get_power_limit (&adev->smu, &limit, true, true);return snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) { adev->powerplay.pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, true);
@@ -2083,7 +2083,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev,uint32_t limit =0 ;if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, false); +smu_get_power_limit (&adev->smu, &limit, false, true);return snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); }else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs->get_power_limit) { adev->powerplay.pp_funcs->get_power_limit (adev->powerplay.pp_handle, &limit, false);
@@ -3064,7 +3064,8 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)struct smu_dpm_context *smu_dpm = &adev->smu.smu_dpm;smu_handle_task (&adev->smu, smu_dpm->dpm_level, -AMD_PP_TASK_DISPLAY_CONFIG_CHANGE ); +AMD_PP_TASK_DISPLAY_CONFIG_CHANGE , + true); }else {if (adev->powerplay.pp_funcs->dispatch_tasks) {if (!amdgpu_device_has_dc_support (adev)) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2 -2
@@ -876,7 +876,7 @@ enum pp_smu_status pp_nv_get_maximum_sustainable_clocks(if (!smu->funcs->get_max_sustainable_clocks_by_dc)return PP_SMU_RESULT_UNSUPPORTED ; -if (!smu->funcs->get_max_sustainable_clocks_by_dc (smu, max_clocks)) +if (!smu_get_max_sustainable_clocks_by_dc (smu, max_clocks))return PP_SMU_RESULT_OK ;return PP_SMU_RESULT_FAIL ;
@@ -895,7 +895,7 @@ enum pp_smu_status pp_nv_get_uclk_dpm_states(struct pp_smu *pp,if (!smu->ppt_funcs->get_uclk_dpm_states)return PP_SMU_RESULT_UNSUPPORTED ; -if (!smu->ppt_funcs->get_uclk_dpm_states (smu, +if (!smu_get_uclk_dpm_states (smu, clock_values_in_khz, num_states))return PP_SMU_RESULT_OK ;
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +646 -50
930 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -3
@@ -772,8 +772,6 @@ static int arcturus_force_clk_levels(struct smu_context *smu,uint32_t soft_min_level, soft_max_level;int ret =0 ; -mutex_lock (&(smu->mutex)); - soft_min_level = mask ? (ffs (mask) -1 ) :0 ; soft_max_level = mask ? (fls (mask) -1 ) :0 ;
@@ -892,7 +890,6 @@ static int arcturus_force_clk_levels(struct smu_context *smu,break ; } -mutex_unlock (&(smu->mutex));return ret; }
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +88 -75
250 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +9 -6
@@ -795,13 +795,13 @@ static int navi10_populate_umd_state_clk(struct smu_context *smu)int ret =0 ;uint32_t min_sclk_freq =0 , min_mclk_freq =0 ; - ret =smu_get_dpm_freq_range (smu,SMU_SCLK , &min_sclk_freq,NULL ); + ret =smu_get_dpm_freq_range (smu,SMU_SCLK , &min_sclk_freq,NULL , false);if (ret)return ret; smu->pstate_sclk = min_sclk_freq *100 ; - ret =smu_get_dpm_freq_range (smu,SMU_MCLK , &min_mclk_freq,NULL ); + ret =smu_get_dpm_freq_range (smu,SMU_MCLK , &min_mclk_freq,NULL , false);if (ret)return ret;
@@ -854,7 +854,7 @@ static int navi10_pre_display_config_changed(struct smu_context *smu)return ret;if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { - ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &max_freq); + ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &max_freq, false);if (ret)return ret; ret =smu_set_hard_freq_range (smu,SMU_UCLK ,0 , max_freq);
@@ -904,7 +904,7 @@ static int navi10_force_dpm_limit_value(struct smu_context *smu, bool highest)for (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);if (ret)return ret;
@@ -931,7 +931,7 @@ static int navi10_unforce_dpm_levels(struct smu_context *smu)for (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);if (ret)return ret;
@@ -1266,7 +1266,10 @@ static int navi10_notify_smc_dispaly_config(struct smu_context *smu)if (smu_feature_is_supported (smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { clock_req.clock_type = amd_pp_dcef_clock; clock_req.clock_freq_in_khz = min_clocks.dcef_clock *10 ; -if (!smu_display_clock_voltage_request (smu, &clock_req)) { + +if (smu->funcs->display_clock_voltage_request) + ret = smu->funcs->display_clock_voltage_request (smu, &clock_req); +if (!ret) {if (smu_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetMinDeepSleepDcefclk,
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +6 -8
@@ -194,7 +194,7 @@ static int renoir_print_clk_levels(struct smu_context *smu,case SMU_SCLK :/* retirve table returned paramters unit is MHz */ cur_value = metrics.ClockFrequency[CLOCK_GFXCLK ]; - ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min, &max); + ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min, &max, false);if (!ret) {/* driver only know min/max gfx_clk, Add level 1 for all other gfx clks */ if (cur_value == max)
@@ -251,7 +251,6 @@ static enum amd_pm_state_type renoir_get_current_power_state(struct smu_context !smu_dpm_ctx->dpm_current_power_state)return -EINVAL ; -mutex_lock (&(smu->mutex));switch (smu_dpm_ctx->dpm_current_power_state->classification.ui_label) {case SMU_STATE_UI_LABEL_BATTERY : pm_type =POWER_STATE_TYPE_BATTERY ;
@@ -269,7 +268,6 @@ static enum amd_pm_state_type renoir_get_current_power_state(struct smu_context pm_type =POWER_STATE_TYPE_DEFAULT ;break ; } -mutex_unlock (&(smu->mutex));return pm_type; }
@@ -314,7 +312,7 @@ static int renoir_force_dpm_limit_value(struct smu_context *smu, bool highest)for (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);if (ret)return ret;
@@ -348,7 +346,7 @@ static int renoir_unforce_dpm_levels(struct smu_context *smu) { clk_type = clk_feature_map[i].clk_type; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);if (ret)return ret;
@@ -435,7 +433,7 @@ static int renoir_force_clk_levels(struct smu_context *smu,return -EINVAL ; } - ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min_freq, &max_freq, false);if (ret)return ret; ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMaxGfxClk,
@@ -511,7 +509,7 @@ static int renoir_set_peak_clock_by_device(struct smu_context *smu)int ret =0 ;uint32_t sclk_freq =0 , uclk_freq =0 ; - ret =smu_get_dpm_freq_range (smu,SMU_SCLK ,NULL , &sclk_freq); + ret =smu_get_dpm_freq_range (smu,SMU_SCLK ,NULL , &sclk_freq, false);if (ret)return ret;
@@ -519,7 +517,7 @@ static int renoir_set_peak_clock_by_device(struct smu_context *smu)if (ret)return ret; - ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &uclk_freq); + ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &uclk_freq, false);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +6 -16
@@ -809,8 +809,11 @@ static int smu_v11_0_set_min_dcef_deep_sleep(struct smu_context *smu)if (!table_context)return -EINVAL ; -return smu_set_deep_sleep_dcefclk (smu, - table_context->boot_values.dcefclk /100 ); +if (smu->funcs->set_deep_sleep_dcefclk) +return smu->funcs->set_deep_sleep_dcefclk (smu, + table_context->boot_values.dcefclk /100 ); + +return 0 ; }static int smu_v11_0_set_tool_table_location (struct smu_context *smu)
@@ -1325,9 +1328,7 @@ smu_v11_0_display_clock_voltage_request(struct smu_context *smu,if (clk_select ==SMU_UCLK && smu->disable_uclk_switch)return 0 ; -mutex_lock (&smu->mutex); ret =smu_set_hard_freq_range (smu, clk_select, clk_freq,0 ); -mutex_unlock (&smu->mutex);if (clk_select ==SMU_UCLK ) smu->hard_min_uclk_req_from_dal = clk_freq;
@@ -1370,12 +1371,10 @@ static int smu_v11_0_gfx_off_control(struct smu_context *smu, bool enable)case CHIP_NAVI12 :if (!(adev->pm.pp_feature &PP_GFXOFF_MASK ))return 0 ; -mutex_lock (&smu->mutex);if (enable) ret =smu_send_smc_msg (smu, SMU_MSG_AllowGfxOff);else ret =smu_send_smc_msg (smu, SMU_MSG_DisallowGfxOff); -mutex_unlock (&smu->mutex);break ;default :break ;
@@ -1491,10 +1490,9 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,if (!speed)return -EINVAL ; -mutex_lock (&(smu->mutex)); ret =smu_v11_0_auto_fan_control (smu,0 );if (ret) - goto set_fan_speed_rpm_failed; +return ret; crystal_clock_freq =amdgpu_asic_get_xclk (adev); tach_period =60 * crystal_clock_freq *10000 / (8 * speed);
@@ -1505,8 +1503,6 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, ret =smu_v11_0_set_fan_static_mode (smu,FDO_PWM_MODE_STATIC_RPM ); -set_fan_speed_rpm_failed: -mutex_unlock (&(smu->mutex));return ret; }
@@ -1517,11 +1513,9 @@ static int smu_v11_0_set_xgmi_pstate(struct smu_context *smu, uint32_t pstate) {int ret =0 ; -mutex_lock (&(smu->mutex)); ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetXgmiMode, pstate ?XGMI_STATE_D0 :XGMI_STATE_D3 ); -mutex_unlock (&(smu->mutex));return ret; }
@@ -1633,9 +1627,7 @@ static int smu_v11_0_set_azalia_d3_pme(struct smu_context *smu) {int ret =0 ; -mutex_lock (&smu->mutex); ret =smu_send_smc_msg (smu, SMU_MSG_BacoAudioD3PME); -mutex_unlock (&smu->mutex);return ret; }
@@ -1767,7 +1759,6 @@ static int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clkint ret =0 , clk_id =0 ;uint32_t param =0 ; -mutex_lock (&smu->mutex); clk_id =smu_clk_get_index (smu, clk_type);if (clk_id <0 ) { ret = -EINVAL ;
@@ -1794,7 +1785,6 @@ static int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk } failed: -mutex_unlock (&smu->mutex);return ret; }
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0 -3
@@ -325,8 +325,6 @@ static int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clkint ret =0 ;uint32_t mclk_mask, soc_mask; -mutex_lock (&smu->mutex); -if (max) { ret = smu_get_profiling_clk_mask(smu, AMD_DPM_FORCED_LEVEL_PROFILE_PEAK, NULL,
@@ -396,7 +394,6 @@ static int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk } } failed: -mutex_unlock (&smu->mutex);return ret; }
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +4 -16
@@ -635,7 +635,6 @@ amd_pm_state_type vega20_get_current_power_state(struct smu_context *smu) !smu_dpm_ctx->dpm_current_power_state)return -EINVAL ; -mutex_lock (&(smu->mutex));switch (smu_dpm_ctx->dpm_current_power_state->classification.ui_label) {case SMU_STATE_UI_LABEL_BATTERY : pm_type =POWER_STATE_TYPE_BATTERY ;
@@ -653,7 +652,6 @@ amd_pm_state_type vega20_get_current_power_state(struct smu_context *smu) pm_type =POWER_STATE_TYPE_DEFAULT ;break ; } -mutex_unlock (&(smu->mutex));return pm_type; }
@@ -1277,8 +1275,6 @@ static int vega20_force_clk_levels(struct smu_context *smu,uint32_t soft_min_level, soft_max_level, hard_min_level;int ret =0 ; -mutex_lock (&(smu->mutex)); - soft_min_level = mask ? (ffs (mask) -1 ) :0 ; soft_max_level = mask ? (fls (mask) -1 ) :0 ;
@@ -1431,7 +1427,6 @@ static int vega20_force_clk_levels(struct smu_context *smu,break ; } -mutex_unlock (&(smu->mutex));return ret; }
@@ -1446,8 +1441,6 @@ static int vega20_get_clock_by_type_with_latency(struct smu_context *smu, dpm_table = smu_dpm->dpm_context; -mutex_lock (&smu->mutex); -switch (clk_type) {case SMU_GFXCLK : single_dpm_table = &(dpm_table->gfx_table);
@@ -1469,7 +1462,6 @@ static int vega20_get_clock_by_type_with_latency(struct smu_context *smu, ret = -EINVAL ; } -mutex_unlock (&smu->mutex);return ret; }
@@ -2542,8 +2534,6 @@ static int vega20_set_od_percentage(struct smu_context *smu,int feature_enabled;PPCLK_e clk_id; -mutex_lock (&(smu->mutex)); - dpm_table = smu_dpm->dpm_context; golden_table = smu_dpm->golden_dpm_context;
@@ -2593,11 +2583,10 @@ static int vega20_set_od_percentage(struct smu_context *smu, } ret =smu_handle_task (smu, smu_dpm->dpm_level, -AMD_PP_TASK_READJUST_POWER_STATE ); +AMD_PP_TASK_READJUST_POWER_STATE , + false); set_od_failed: -mutex_unlock (&(smu->mutex)); -return ret; }
@@ -2822,10 +2811,9 @@ static int vega20_odn_edit_dpm_table(struct smu_context *smu, }if (type ==PP_OD_COMMIT_DPM_TABLE ) { -mutex_lock (&(smu->mutex)); ret =smu_handle_task (smu, smu_dpm->dpm_level, -AMD_PP_TASK_READJUST_POWER_STATE ); -mutex_unlock (&(smu->mutex)); +AMD_PP_TASK_READJUST_POWER_STATE , + false); }return ret;
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/3 drm/amd/powerplay: split out those internal used swSMU APIs V2
Those swSMU APIs used internally are moved to smu_internal.h while others are kept in amdgpu_smu.h.
V2: give a better name smu_internal.h for the place to hold
those internal APIs
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 164 +------------- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 206 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 1 + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 1 + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 1 + 9 files changed, 214 insertions(+), 163 deletions(-) create mode 100644 drivers/gpu/drm/amd/powerplay/smu_internal.h
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -0
@@ -25,6 +25,7 @@#include <drm/drmP.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "soc15_common.h" #include "smu_v11_0.h" #include "smu_v12_0.h"
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -0
@@ -25,6 +25,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -163
227 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1 -0
@@ -25,6 +25,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1 -0
@@ -23,6 +23,7 @@#include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "soc15_common.h" #include "smu_v12_0_ppsmc.h" #include "smu12_driver_if.h"
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +206 -0
206 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1 -0
@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +1 -0
@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v12_0.h"
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +1 -0
@@ -25,6 +25,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h"
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Deucher, Alexander
Acked-by Alex DeucherRE: [PATCH 2/3] drm/amd/powerplay: split out those internal used swSMU APIs V2
Quoted 10 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Sunday, October 20, 2019 10:48 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Grodzovsky, Andrey <[email protected]>; Xu, Feifei <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH 2/3] drm/amd/powerplay: split out those internal used swSMU APIs V2
Quoted 8 lines
Those swSMU APIs used internally are moved to
smu_internal.hwhile others are kept inamdgpu_smu.h.V2: give a better name
smu_internal.hfor the place to hold
those internal APIsChange-Id Ib726ef7f65dee46e47a07680b71e6e043e459f42Signed-off-by Evan Quan <[email protected]>
Quoted 755 lines
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1 + drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 1 + .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 164 +------------- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 1 + drivers/gpu/drm/amd/powerplay/smu_internal.h | 206 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 1 + drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 1 + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 1 + 9 files changed, 214 insertions(+), 163 deletions(-) create mode 100644
drivers/gpu/drm/amd/powerplay/smu_internal.hdrivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-0@@ -25,6 +25,7 @@#include <drm/drmP.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "soc15_common.h" #include "smu_v11_0.h" #include "smu_v12_0.h" drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1
-0@@ -25,6 +25,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-16@@ -555,92 +555,13 @@ struct smu_funcsint (*override_pcie_parameters)(struct smu_context *smu); }; -#define smu_init_microcode (smu) \ - ((smu)->funcs->init_microcode ? (smu)->funcs- >init_microcode((smu)) : 0) -#define smu_init_smc_tables (smu) \ - ((smu)->funcs->init_smc_tables ? (smu)->funcs- >init_smc_tables((smu)) : 0) -#define smu_fini_smc_tables (smu) \ - ((smu)->funcs->fini_smc_tables ? (smu)->funcs- >fini_smc_tables((smu)) : 0) -#define smu_init_power (smu) \ - ((smu)->funcs->init_power ? (smu)->funcs->init_power((smu)) : 0) -#define smu_fini_power (smu) \ - ((smu)->funcs->fini_power ? (smu)->funcs->fini_power((smu)) : 0)int smu_load_microcode (struct smu_context *smu);int smu_check_fw_status (struct smu_context *smu); -#define smu_setup_pptable (smu) \ - ((smu)->funcs->setup_pptable ? (smu)->funcs- >setup_pptable((smu)) : 0) -#define smu_powergate_sdma (smu, gate) \ - ((smu)->funcs->powergate_sdma ? (smu)->funcs- >powergate_sdma((smu), (gate)) : 0) -#define smu_powergate_vcn (smu, gate) \ - ((smu)->funcs->powergate_vcn ? (smu)->funcs- >powergate_vcn((smu), (gate)) : 0) int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled); -#define
smu_get_vbios_bootup_values(smu)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->funcs->get_vbios_bootup_values ? (smu)->funcs-Quoted 1 line
get_vbios_bootup_values((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_clk_info_from_vbios (smu) \ - ((smu)->funcs->get_clk_info_from_vbios ? (smu)->funcs-Quoted 1 line
get_clk_info_from_vbios((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_check_pptable (smu) \ - ((smu)->funcs->check_pptable ? (smu)->funcs-Quoted 1 line
check_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_parse_pptable (smu) \ - ((smu)->funcs->parse_pptable ? (smu)->funcs-Quoted 1 line
parse_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_populate_smc_tables (smu) \ - ((smu)->funcs->populate_smc_tables ? (smu)->funcs-Quoted 1 line
populate_smc_tables((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_check_fw_version (smu) \ - ((smu)->funcs->check_fw_version ? (smu)->funcs-Quoted 1 line
check_fw_version((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_write_pptable (smu) \ - ((smu)->funcs->write_pptable ? (smu)->funcs-Quoted 1 line
write_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_min_dcef_deep_sleep (smu) \ - ((smu)->funcs->set_min_dcef_deep_sleep ? (smu)->funcs-Quoted 1 line
set_min_dcef_deep_sleep((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_tool_table_location (smu) \ - ((smu)->funcs->set_tool_table_location ? (smu)->funcs-Quoted 1 line
set_tool_table_location((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_notify_memory_pool_location (smu) \ - ((smu)->funcs->notify_memory_pool_location ? (smu)->funcs-Quoted 1 line
notify_memory_pool_location((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_gfx_off_control (smu, enable) \ - ((smu)->funcs->gfx_off_control ? (smu)->funcs-Quoted 1 line
gfx_off_control((smu), (enable)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-3- -#define smu_write_watermarks_table (smu) \ - ((smu)->funcs->write_watermarks_table ? (smu)->funcs-Quoted 1 line
write_watermarks_table((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_last_dcef_min_deep_sleep_clk (smu) \ - ((smu)->funcs->set_last_dcef_min_deep_sleep_clk ? (smu)->funcs-Quoted 1 line
set_last_dcef_min_deep_sleep_clk((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_system_features_control (smu, en) \ - ((smu)->funcs->system_features_control ? (smu)->funcs-Quoted 1 line
system_features_control((smu), (en)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_init_max_sustainable_clocks (smu) \ - ((smu)->funcs->init_max_sustainable_clocks ? (smu)->funcs-Quoted 1 line
init_max_sustainable_clocks((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_default_od_settings (smu, initialize) \ - ((smu)->ppt_funcs->set_default_od_settings ? (smu)->ppt_funcs-Quoted 1 line
set_default_od_settings((smu), (initialize)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-3-int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed); -#define smu_send_smc_msg (smu, msg) \ - ((smu)->funcs->send_smc_msg? (smu)->funcs-Quoted 1 line
send_smc_msg((smu), (msg)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_send_smc_msg_with_param (smu, msg, param) \ - ((smu)->funcs->send_smc_msg_with_param? (smu)->funcs-Quoted 1 line
send_smc_msg_with_param((smu), (msg), (param)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_read_smc_arg (smu, arg) \ - ((smu)->funcs->read_smc_arg? (smu)->funcs-Quoted 1 line
read_smc_arg((smu), (arg)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_alloc_dpm_context (smu) \ - ((smu)->ppt_funcs->alloc_dpm_context ? (smu)->ppt_funcs-Quoted 1 line
alloc_dpm_context((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_init_display_count (smu, count) \ - ((smu)->funcs->init_display_count ? (smu)->funcs-Quoted 1 line
init_display_count((smu), (count)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_feature_set_allowed_mask (smu) \ - ((smu)->funcs->set_allowed_mask? (smu)->funcs-Quoted 1 line
set_allowed_mask((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_feature_get_enabled_mask (smu, mask, num) \ - ((smu)->funcs->get_enabled_mask? (smu)->funcs-Quoted 1 line
get_enabled_mask((smu), (mask), (num)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_is_dpm_running (smu) \ - ((smu)->ppt_funcs->is_dpm_running ? (smu)->ppt_funcs-Quoted 1 line
is_dpm_running((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_notify_display_change (smu) \ - ((smu)->funcs->notify_display_change? (smu)->funcs-Quoted 1 line
notify_display_change((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_store_powerplay_table (smu) \ - ((smu)->ppt_funcs->store_powerplay_table ? (smu)->ppt_funcs-Quoted 1 line
store_powerplay_table((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_check_powerplay_table (smu) \ - ((smu)->ppt_funcs->check_powerplay_table ? (smu)->ppt_funcs-Quoted 1 line
check_powerplay_table((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_append_powerplay_table (smu) \ - ((smu)->ppt_funcs->append_powerplay_table ? (smu)->ppt_funcs-Quoted 1 line
append_powerplay_table((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_default_dpm_table (smu) \ - ((smu)->ppt_funcs->set_default_dpm_table ? (smu)->ppt_funcs-Quoted 1 line
set_default_dpm_table((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_populate_umd_state_clk (smu) \ - ((smu)->ppt_funcs->populate_umd_state_clk ? (smu)->ppt_funcs-Quoted 1 line
populate_umd_state_clk((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_default_od8_settings (smu) \ - ((smu)->ppt_funcs->set_default_od8_settings ? (smu)->ppt_funcs-Quoted 1 line
set_default_od8_settings((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-1+int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed); int smu_get_power_limit(struct smu_context *smu, uint32_t *limit,@@ -648,8 +569,6 @@ int smu_get_power_limit(struct smu_context *smu, bool lock_needed); int smu_set_power_limit(struct smu_context *smu, uint32_t limit); -#definesmu_get_current_clk_freq (smu, clk_id, value) \ - ((smu)->funcs->get_current_clk_freq? (smu)->funcs- >get_current_clk_freq((smu), (clk_id), (value)) : 0) int smu_print_clk_levels(struct smu_context *smu, enum smu_clk_type
clk_type, char *buf); intsmu_get_od_percentage(struct smu_context *smu, enum smu_clk_type type); intsmu_set_od_percentage(struct smu_context *smu, enum smu_clk_type type, uint32_t value); @@ -657,68 +576,24 @@ int smu_set_od_percentage(structsmu_context*smu, enumsmu_clk_typetype, uint3 int smu_od_edit_dpm_table(structsmu_context*smu,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2enum PP_OD_DPM_TABLE_COMMAND type, long *input, uint32_t size); -#define smu_tables_init (smu, tab) \ - ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs-Quoted 1 line
tables_init((smu), (tab)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_thermal_fan_table (smu) \ - ((smu)->ppt_funcs->set_thermal_fan_table ? (smu)->ppt_funcs-Quoted 1 line
set_thermal_fan_table((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_start_thermal_control (smu) \ - ((smu)->funcs->start_thermal_control? (smu)->funcs-Quoted 1 line
start_thermal_control((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_stop_thermal_control (smu) \ - ((smu)->funcs->stop_thermal_control? (smu)->funcs-Quoted 1 line
stop_thermal_control((smu)) : 0)
int smu_read_sensor(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2enum amd_pp_sensors sensor, void *data, uint32_t *size); -#define smu_smc_read_sensor (smu, sensor, data, size) \ - ((smu)->funcs->read_sensor? (smu)->funcs->read_sensor((smu),(sensor), (data), (size)) :
-EINVAL)
intsmu_get_power_profile_mode(struct smu_context *smu, char *buf);int smu_set_power_profile_mode(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2long *param, uint32_t param_size, bool lock_needed); -#define smu_pre_display_config_changed (smu) \ - ((smu)->ppt_funcs->pre_display_config_changed ? (smu)-Quoted 1 line
ppt_funcs->pre_display_config_changed((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_display_config_changed (smu) \ - ((smu)->ppt_funcs->display_config_changed ? (smu)->ppt_funcs-Quoted 1 line
display_config_changed((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_apply_clocks_adjust_rules (smu) \ - ((smu)->ppt_funcs->apply_clocks_adjust_rules ? (smu)->ppt_funcs-Quoted 1 line
apply_clocks_adjust_rules((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_notify_smc_dispaly_config (smu) \ - ((smu)->ppt_funcs->notify_smc_dispaly_config ? (smu)->ppt_funcs-Quoted 1 line
notify_smc_dispaly_config((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_force_dpm_limit_value (smu, highest) \ - ((smu)->ppt_funcs->force_dpm_limit_value ? (smu)->ppt_funcs-Quoted 1 line
force_dpm_limit_value((smu), (highest)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_unforce_dpm_levels (smu) \ - ((smu)->ppt_funcs->unforce_dpm_levels ? (smu)->ppt_funcs-Quoted 1 line
unforce_dpm_levels((smu)) : 0)
-#define
smu_get_profiling_clk_mask(smu, level, sclk_mask, mclk_mask, soc_mask)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->ppt_funcs->get_profiling_clk_mask ? (smu)->ppt_funcs-Quoted 1 line
get_profiling_clk_mask((smu), (level), (
sclk_mask), (mclk_mask),(
soc_mask)) : 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_cpu_power_state (smu) \ - ((smu)->ppt_funcs->set_cpu_power_state ? (smu)->ppt_funcs-Quoted 1 line
set_cpu_power_state((smu)) : 0)
int
smu_get_fan_control_mode(struct smu_context *smu); intsmu_set_fan_control_mode(struct smu_context *smu, int value); intsmu_get_fan_speed_percent(struct smu_context *smu, uint32_t *speed); intsmu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed); intsmu_get_fan_speed_rpm(struct smu_context *smu, uint32_t *speed);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_msg_get_index (smu, msg) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_msg_index?(smu)->ppt_funcs->get_smu_msg_index((smu), (msg)) :
-EINVAL) : - EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_clk_get_index (smu, msg) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_clk_index?(smu)->ppt_funcs->get_smu_clk_index((smu), (msg)) :
-EINVAL) :-EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_feature_get_index (smu, msg) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_feature_index?(smu)->ppt_funcs->get_smu_feature_index((smu), (msg)) :
-EINVAL) : - EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_table_get_index (smu, tab) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_table_index?(smu)->ppt_funcs->get_smu_table_index((smu), (tab)) :
-EINVAL) : - EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_power_get_index (smu, src) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_power_index?(smu)->ppt_funcs->get_smu_power_index((smu), (src)) :
-EINVAL) : - EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_workload_get_type (smu, profile) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_workload_type?(smu)->ppt_funcs->get_workload_type((smu), (profile)) :
-EINVAL) : - EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_run_btc (smu) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->run_btc? (smu)-Quoted 1 line
ppt_funcs->run_btc((smu)) : 0) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_allowed_feature_mask (smu, feature_mask, num) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs-Quoted 2 lines
get_allowed_feature_mask? (smu)->ppt_funcs-get_allowed_feature_mask((smu), (feature_mask), (num)): 0) : 0)int
smu_set_deep_sleep_dcefclk(struct smu_context *smu, int clk); intsmu_set_active_display_count(struct smu_context *smu, uint32_t count); - #definesmu_store_cc6_data(smu, st, cc6_dis, pst_dis, pst_sw_dis)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->funcs->store_cc6_data ? (smu)->funcs-Quoted 1 line
store_cc6_data((smu), (st), (cc6_dis), (pst_dis), (pst_sw_dis)): 0)int smu_get_clock_by_type(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0enum amd_pp_clock_type type,@@ -738,37 +613,15 @@ int smu_get_clock_by_type_with_voltage(struct
smu_context*smu, int smu_display_clock_voltage_request(structsmu_context*smu,
structpp_display_clock_request*clock_req); intsmu_display_disable_memory_clock_switch(struct smu_context *smu, bool disable_memory_clock_switch); -#definesmu_get_dal_power_level(smu, clocks)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->funcs->get_dal_power_level ? (smu)->funcs-Quoted 1 line
get_dal_power_level((smu), (clocks)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_perf_level (smu, designation, level) \ - ((smu)->funcs->get_perf_level ? (smu)->funcs-Quoted 1 line
get_perf_level((smu), (designation), (level)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_current_shallow_sleep_clocks (smu, clocks) \ - ((smu)->funcs->get_current_shallow_sleep_clocks ? (smu)->funcs-Quoted 1 line
get_current_shallow_sleep_clocks((smu), (clocks)): 0)int
smu_notify_smu_enable_pwe(struct smu_context *smu);int smu_set_watermarks_for_clock_ranges(struct
smu_context*smu,
structdm_pp_wm_sets_with_clock_ranges_soc15*clock_ranges); -#definesmu_dpm_set_uvd_enable(smu, enable)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->ppt_funcs->dpm_set_uvd_enable ? (smu)->ppt_funcs-Quoted 1 line
dpm_set_uvd_enable((smu), (enable)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_dpm_set_vce_enable (smu, enable) \ - ((smu)->ppt_funcs->dpm_set_vce_enable ? (smu)->ppt_funcs-Quoted 1 line
dpm_set_vce_enable((smu), (enable)): 0)int smu_set_xgmi_pstate(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2uint32_t pstate); -#define smu_set_watermarks_table (smu, tab, clock_ranges) \ - ((smu)->ppt_funcs->set_watermarks_table ? (smu)->ppt_funcs-Quoted 1 line
set_watermarks_table((smu), (tab), (clock_ranges)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_current_clk_freq_by_table (smu, clk_type, value) \ - ((smu)->ppt_funcs->get_current_clk_freq_by_table ? (smu)-Quoted 1 line
ppt_funcs->get_current_clk_freq_by_table((smu), (clk_type), (value)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_thermal_temperature_range_update (smu, range, rw) \ - ((smu)->ppt_funcs->thermal_temperature_range_update? (smu)-Quoted 1 line
ppt_funcs->thermal_temperature_range_update((smu), (range), (rw)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_thermal_temperature_range (smu, range) \ - ((smu)->ppt_funcs->get_thermal_temperature_range? (smu)-Quoted 1 line
ppt_funcs->get_thermal_temperature_range((smu), (range)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_register_irq_handler (smu) \ - ((smu)->funcs->register_irq_handler ? (smu)->funcs-Quoted 1 line
register_irq_handler(smu): 0)int
smu_set_azalia_d3_pme(struct smu_context *smu); -#definesmu_get_dpm_ultimate_freq(smu, param, min, max)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->funcs->get_dpm_ultimate_freq ? (smu)->funcs-Quoted 1 line
get_dpm_ultimate_freq((smu), (param), (min), (max)): 0)bool
smu_baco_is_support(struct smu_context *smu);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0@@ -777,21 +630,6 @@ int smu_baco_get_state(struct smu_context *smu,enum
smu_baco_state*state); intsmu_baco_reset(struct smu_context *smu);int
smu_mode2_reset(struct smu_context *smu); -#definesmu_asic_set_performance_level(smu, level)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->ppt_funcs->set_performance_level? (smu)->ppt_funcs-Quoted 1 line
set_performance_level((smu), (level)):-EINVAL);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_dump_pptable (smu) \ - ((smu)->ppt_funcs->dump_pptable ? (smu)->ppt_funcs-Quoted 1 line
dump_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_dpm_clk_limited (smu, clk_type, dpm_level, freq) \ - ((smu)->ppt_funcs->get_dpm_clk_limited ? (smu)-Quoted 1 line
ppt_funcs->get_dpm_clk_limited((smu), (clk_type), (dpm_level), (freq)): -EINVAL)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-3- -#define smu_set_soft_freq_limited_range (smu, clk_type, min, max) \ - ((smu)->funcs->set_soft_freq_limited_range ? (smu)-Quoted 1 line
funcs->set_soft_freq_limited_range((smu), (clk_type), (min), (max)): -EINVAL)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-3- -#define smu_override_pcie_parameters (smu) \ - ((smu)->funcs->override_pcie_parameters ? (smu)->funcs-Quoted 1 line
override_pcie_parameters((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2- -#define smu_update_pcie_parameters(smu, pcie_gen_cap,
pcie_width_cap) \drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->ppt_funcs->update_pcie_parameters ? (smu)-Quoted 1 line
ppt_funcs->update_pcie_parameters((smu), (
pcie_gen_cap),(
pcie_width_cap)) : 0)extern int smu_get_atom_data_table(struct
smu_context*smu,uint32_t
table,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0uint16_t *size, uint8_t *frev, uint8_t *crev,drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-0@@ -25,6 +25,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-0@@ -23,6 +23,7 @@#include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "soc15_common.h" #include "smu_v12_0_ppsmc.h" #include "smu12_driver_if.h" drivers/gpu/drm/amd/powerplay/smu_internal.h new file +24
-0@@ -0,0 +1,206 @@ +/* +* Copyright 2019 Advanced Micro Devices, Inc. +* +* Permission is hereby granted, free of charge, to any person +obtaining a +* copy of this software and associated documentation files (the +"Software"), +* to deal in the Software without restriction, including without +limitation +* the rights to use, copy, modify, merge, publish, distribute, +sublicense, +* and/or sell copies of the Software, and to permit persons to whom +the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be +included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +6
-0+SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, +DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE ORTHE USE
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +11
-0+OR +* OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __SMU_INTERNAL_H__ +#define __SMU_INTERNAL_H__ + +#include "amdgpu_smu.h" + +#define smu_init_microcode (smu) \ + ((smu)->funcs->init_microcode ? (smu)->funcs-Quoted 1 line
init_microcode((smu)) :
+0) #define
smu_init_smc_tables(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->init_smc_tables ? (smu)->funcs-Quoted 1 line
init_smc_tables((smu))
+: 0) #define
smu_fini_smc_tables(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->fini_smc_tables ? (smu)->funcs-Quoted 1 line
fini_smc_tables((smu))
+: 0) #define
smu_init_power(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +6
-0+ ((smu)->funcs->init_power ? (smu)->funcs->init_power((smu)) : 0) +#define smu_fini_power (smu) \ + ((smu)->funcs->fini_power ? (smu)->funcs->fini_power((smu)) : 0) + +#define smu_setup_pptable (smu) \ + ((smu)->funcs->setup_pptable ? (smu)->funcs-Quoted 1 line
setup_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+#define smu_powergate_sdma (smu, gate) \ + ((smu)->funcs->powergate_sdma ? (smu)->funcs-Quoted 1 line
powergate_sdma((smu),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+(gate)) : 0) #define smu_powergate_vcn(smu, gate) \ + ((smu)->funcs->powergate_vcn ? (smu)->funcs-Quoted 1 line
powergate_vcn((smu),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+(gate)) : 0) + +#define smu_get_vbios_bootup_values (smu) \ + ((smu)->funcs->get_vbios_bootup_values ? +(smu)->funcs->get_vbios_bootup_values((smu)) : 0) #define
smu_get_clk_info_from_vbios(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->get_clk_info_from_vbios ? +(smu)->funcs->get_clk_info_from_vbios((smu)) : 0) #define
smu_check_pptable(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->check_pptable ? (smu)->funcs-Quoted 1 line
check_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+#define smu_parse_pptable (smu) \ + ((smu)->funcs->parse_pptable ? (smu)->funcs-Quoted 1 line
parse_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +3
-0+#define smu_populate_smc_tables (smu) \ + ((smu)->funcs->populate_smc_tables ? +(smu)->funcs->populate_smc_tables((smu)) : 0) #define
smu_check_fw_version(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->check_fw_version ? +(smu)->funcs->check_fw_version((smu)) : 0) #define
smu_write_pptable(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->write_pptable ? (smu)->funcs-Quoted 1 line
write_pptable((smu)) : 0)
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +3
-0+#define smu_set_min_dcef_deep_sleep (smu) \ + ((smu)->funcs->set_min_dcef_deep_sleep ? +(smu)->funcs->set_min_dcef_deep_sleep((smu)) : 0) #define
smu_set_tool_table_location(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->set_tool_table_location ? +(smu)->funcs->set_tool_table_location((smu)) : 0) #define
smu_notify_memory_pool_location(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->notify_memory_pool_location ? +(smu)->funcs->notify_memory_pool_location((smu)) : 0) #define
smu_gfx_off_control(smu, enable)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->gfx_off_control ? (smu)->funcs-Quoted 1 line
gfx_off_control((smu),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+(enable)) : 0) + +#define smu_write_watermarks_table (smu) \ + ((smu)->funcs->write_watermarks_table ? +(smu)->funcs->write_watermarks_table((smu)) : 0) #define
smu_set_last_dcef_min_deep_sleep_clk(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->set_last_dcef_min_deep_sleep_clk ? +(smu)->funcs->set_last_dcef_min_deep_sleep_clk((smu)) : 0) #define
smu_system_features_control(smu, en)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->system_features_control ? +(smu)->funcs->system_features_control((smu), (en)) : 0) #define
smu_init_max_sustainable_clocks(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->init_max_sustainable_clocks ? +(smu)->funcs->init_max_sustainable_clocks((smu)) : 0) #define
smu_set_default_od_settings(smu, initialize)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+ ((smu)->ppt_funcs->set_default_od_settings ? +(smu)->ppt_funcs->set_default_od_settings((smu), (initialize)) : 0) + +#define smu_send_smc_msg (smu, msg) \ + ((smu)->funcs->send_smc_msg? (smu)->funcs-Quoted 1 line
send_smc_msg((smu), (msg))+: 0) #define
smu_send_smc_msg_with_param(smu, msg, param)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->send_smc_msg_with_param? +(smu)->funcs->send_smc_msg_with_param ((smu), (msg), (param)) :0 )#define
smu_read_smc_arg(smu, arg)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->read_smc_arg? (smu)->funcs-Quoted 1 line
read_smc_arg((smu), (arg))+: 0) #define
smu_alloc_dpm_context(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->alloc_dpm_context ? +(smu)->ppt_funcs->alloc_dpm_context((smu)) : 0) #define
smu_init_display_count(smu, count)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->init_display_count ? +(smu)->funcs->init_display_count((smu), (count)) : 0) #define
smu_feature_set_allowed_mask(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->set_allowed_mask? (smu)->funcs-Quoted 1 line
set_allowed_mask((smu))
+: 0) #define
smu_feature_get_enabled_mask(smu, mask, num)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->get_enabled_mask? (smu)->funcs-Quoted 1 line
get_enabled_mask((smu),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +3
-0+(mask), (num)) : 0) #define smu_is_dpm_running(smu) \ + ((smu)->ppt_funcs->is_dpm_running ? +(smu)->ppt_funcs->is_dpm_running((smu)) : 0) #define
smu_notify_display_change(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->notify_display_change? +(smu)->funcs->notify_display_change((smu)) : 0) #define
smu_store_powerplay_table(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->store_powerplay_table ? +(smu)->ppt_funcs->store_powerplay_table((smu)) : 0) #define
smu_check_powerplay_table(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->check_powerplay_table ? +(smu)->ppt_funcs->check_powerplay_table((smu)) : 0) #define
smu_append_powerplay_table(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->append_powerplay_table ? +(smu)->ppt_funcs->append_powerplay_table((smu)) : 0) #define
smu_set_default_dpm_table(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->set_default_dpm_table ? +(smu)->ppt_funcs->set_default_dpm_table((smu)) : 0) #define
smu_populate_umd_state_clk(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->populate_umd_state_clk ? +(smu)->ppt_funcs->populate_umd_state_clk((smu)) : 0) #define
smu_set_default_od8_settings(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +9
-0+ ((smu)->ppt_funcs->set_default_od8_settings ? +(smu)->ppt_funcs->set_default_od8_settings((smu)) : 0) + +#define smu_get_current_clk_freq (smu, clk_id, value) \ + ((smu)->funcs->get_current_clk_freq? +(smu)->funcs->get_current_clk_freq((smu), (clk_id), (value)) : 0) + +#define smu_tables_init (smu, tab) \ + ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs-Quoted 1 line
tables_init((smu),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +3
-0+(tab)) : 0) #define smu_set_thermal_fan_table(smu) \ + ((smu)->ppt_funcs->set_thermal_fan_table ? +(smu)->ppt_funcs->set_thermal_fan_table((smu)) : 0) #define
smu_start_thermal_control(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->funcs->start_thermal_control? +(smu)->funcs->start_thermal_control((smu)) : 0) #define
smu_stop_thermal_control(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+ ((smu)->funcs->stop_thermal_control? +(smu)->funcs->stop_thermal_control((smu)) : 0) + +#define smu_smc_read_sensor (smu, sensor, data, size) \ + ((smu)->funcs->read_sensor? (smu)->funcs->read_sensor((smu),(sensor),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+(data), (size)) : -EINVAL) + +#define smu_pre_display_config_changed (smu) \ + ((smu)->ppt_funcs->pre_display_config_changed ? +(smu)->ppt_funcs->pre_display_config_changed((smu)) : 0) #define
smu_display_config_changed(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->display_config_changed ? +(smu)->ppt_funcs->display_config_changed((smu)) : 0) #define
smu_apply_clocks_adjust_rules(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->apply_clocks_adjust_rules ? +(smu)->ppt_funcs->apply_clocks_adjust_rules((smu)) : 0) #define
smu_notify_smc_dispaly_config(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->notify_smc_dispaly_config ? +(smu)->ppt_funcs->notify_smc_dispaly_config((smu)) : 0) #define
smu_force_dpm_limit_value(smu, highest)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->force_dpm_limit_value ? +(smu)->ppt_funcs->force_dpm_limit_value((smu), (highest)) : 0) #define
smu_unforce_dpm_levels(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->unforce_dpm_levels ? +(smu)->ppt_funcs->unforce_dpm_levels((smu)) : 0) #define
smu_get_profiling_clk_mask(smu, level, sclk_mask, mclk_mask, soc_mask)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->get_profiling_clk_mask ? +(smu)->ppt_funcs->get_profiling_clk_mask((smu), (level), (sclk_mask),(
mclk_mask), (soc_mask)) : 0) #definesmu_set_cpu_power_state(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +6
-0+ ((smu)->ppt_funcs->set_cpu_power_state ? +(smu)->ppt_funcs->set_cpu_power_state((smu)) : 0) + +#define smu_msg_get_index (smu, msg) \ + ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_msg_index? +(smu)->ppt_funcs->get_smu_msg_index((smu), (msg)) : -EINVAL) : -EINVAL) #define
smu_clk_get_index(smu, msg)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_clk_index? +(smu)->ppt_funcs->get_smu_clk_index ((smu), (msg)) : -EINVAL ) : -EINVAL )#define
smu_feature_get_index(smu, msg)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_feature_index? +(smu)->ppt_funcs->get_smu_feature_index((smu), (msg)) : -EINVAL) : -EINVAL) #define
smu_table_get_index(smu, tab)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_table_index? +(smu)->ppt_funcs->get_smu_table_index((smu), (tab)) : -EINVAL) : -EINVAL) #define
smu_power_get_index(smu, src)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_power_index? +(smu)->ppt_funcs->get_smu_power_index((smu), (src)) : -EINVAL) : -EINVAL) #define
smu_workload_get_type(smu, profile)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_workload_type? +(smu)->ppt_funcs->get_workload_type((smu), (profile)) : -EINVAL) : -EINVAL) #define
smu_run_btc(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs->run_btc? +(smu)->ppt_funcs->run_btc((smu)) : 0) : 0) #define
smu_get_allowed_feature_mask(smu, feature_mask, num)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->ppt_funcs? ((smu)->ppt_funcs-Quoted 1 line
get_allowed_feature_mask?drivers/gpu/drm/amd/powerplay/smu_internal.h new file +6
-0+(smu)->ppt_funcs->get_allowed_feature_mask((smu), (feature_mask), +(num)) : 0) : 0) + + +#define smu_store_cc6_data (smu, st, cc6_dis, pst_dis, pst_sw_dis) \ + ((smu)->funcs->store_cc6_data ? (smu)->funcs-Quoted 1 line
store_cc6_data((smu),
drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+(st), (cc6_dis), (pst_dis), (pst_sw_dis)) : 0) + +#define smu_get_dal_power_level (smu, clocks) \ + ((smu)->funcs->get_dal_power_level ? +(smu)->funcs->get_dal_power_level((smu), (clocks)) : 0) #define
smu_get_perf_level(smu, designation, level)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +1
-0+ ((smu)->funcs->get_perf_level ? (smu)->funcs-Quoted 1 line
get_perf_level((smu),
+(designation), (level)) : 0) #define
smu_get_current_shallow_sleep_clocks(smu, clocks)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +6
-0+ ((smu)->funcs->get_current_shallow_sleep_clocks ? +(smu)->funcs->get_current_shallow_sleep_clocks((smu), (clocks)) : 0) + +#define smu_dpm_set_uvd_enable (smu, enable) \ + ((smu)->ppt_funcs->dpm_set_uvd_enable ? +(smu)->ppt_funcs->dpm_set_uvd_enable((smu), (enable)) : 0) #define
smu_dpm_set_vce_enable(smu, enable)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +6
-0+ ((smu)->ppt_funcs->dpm_set_vce_enable ? +(smu)->ppt_funcs->dpm_set_vce_enable((smu), (enable)) : 0) + +#define smu_set_watermarks_table (smu, tab, clock_ranges) \ + ((smu)->ppt_funcs->set_watermarks_table ? +(smu)->ppt_funcs->set_watermarks_table((smu), (tab), (clock_ranges)) :0) #define
smu_get_current_clk_freq_by_table(smu, clk_type, value)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->get_current_clk_freq_by_table ? +(smu)->ppt_funcs->get_current_clk_freq_by_table((smu), (clk_type),(value)) : 0) #define
smu_thermal_temperature_range_update(smu, range, rw)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->thermal_temperature_range_update? +(smu)->ppt_funcs->thermal_temperature_range_update((smu), (range),(rw)) : 0) #define
smu_get_thermal_temperature_range(smu, range)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->get_thermal_temperature_range? +(smu)->ppt_funcs->get_thermal_temperature_range ((smu), (range)) :0 )#define
smu_register_irq_handler(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +10
-0+ ((smu)->funcs->register_irq_handler ? +(smu)->funcs->register_irq_handler(smu) : 0) + +#define smu_get_dpm_ultimate_freq (smu, param, min, max) \ + ((smu)->funcs->get_dpm_ultimate_freq ? +(smu)->funcs->get_dpm_ultimate_freq((smu), (param), (min), (max)) : 0) + +#define smu_asic_set_performance_level (smu, level) \ + ((smu)->ppt_funcs->set_performance_level? +(smu)->ppt_funcs->set_performance_level((smu), (level)) : -EINVAL);#define
smu_dump_pptable(smu)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +2
-0+ ((smu)->ppt_funcs->dump_pptable ? +(smu)->ppt_funcs->dump_pptable((smu)) : 0) #define
smu_get_dpm_clk_limited(smu, clk_type, dpm_level, freq)\drivers/gpu/drm/amd/powerplay/smu_internal.h new file +14
-0+ ((smu)->ppt_funcs->get_dpm_clk_limited ? +(smu)->ppt_funcs->get_dpm_clk_limited ((smu), (clk_type), (dpm_level), +(freq)) : -EINVAL) + +#define smu_set_soft_freq_limited_range (smu, clk_type, min, max) \ + ((smu)->funcs->set_soft_freq_limited_range ? +(smu)->funcs->set_soft_freq_limited_range((smu), (clk_type), (min), +(max)) : -EINVAL) + +#define smu_override_pcie_parameters (smu) \ + ((smu)->funcs->override_pcie_parameters ? +(smu)->funcs->override_pcie_parameters((smu)) : 0) + +#define smu_update_pcie_parameters(smu, pcie_gen_cap,
pcie_width_cap) \drivers/gpu/drm/amd/powerplay/smu_internal.h new file +5
-0+ ((smu)->ppt_funcs->update_pcie_parameters ? +(smu)->ppt_funcs->update_pcie_parameters ((smu), (pcie_gen_cap), +(pcie_width_cap)) : 0) + +#endif drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" drivers/gpu/drm/amd/powerplay/smu_v12_0.c +1
-0@@ -24,6 +24,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v12_0.h" drivers/gpu/drm/amd/powerplay/vega20_ppt.c +1
-1@@ -25,6 +25,7 @@#include <linux/firmware.h> #include "amdgpu.h" #include "amdgpu_smu.h" +#include "smu_internal.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" --
Quoted 1 line
2.23.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/powerplay: clear the swSMU code layer
In reply to a message not in the archiveWith this cleanup, the APIs from amdgpu_smu.c will map to ASIC specific ones directly. Those can be shared around all SMU V11/V12 ASICs will be put in smu_v11_0.c and smu_v12_0.c respectively.
--- drivers/gpu/drm/amd/amdgpu/soc15.c | 4 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 48 ++--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 119 +++++------ drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 53 ++++- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 9 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 127 +++++++++++- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 41 +++- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 56 +++++- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 15 ++ drivers/gpu/drm/amd/powerplay/smu_internal.h | 84 ++++---- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 189 +++++------------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 70 ++----- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 57 +++++- 13 files changed, 542 insertions(+), 330 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +2 -2
@@ -511,7 +511,7 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev)if (pp_funcs->set_asic_baco_state (pp_handle,0 ))return -EIO ; }else { -if (!smu->funcs) +if (!smu->ppt_funcs)return -ENOENT ;if (smu_baco_reset (smu))
@@ -568,7 +568,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev) }break ;case CHIP_ARCTURUS : -if (smu->funcs &&smu_baco_is_support (smu)) +if (smu->ppt_funcs &&smu_baco_is_support (smu)) baco_reset = true;else baco_reset = false;
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +24 -24
158 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +63 -56
295 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +52 -1
65 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -8
@@ -347,7 +347,6 @@ struct smu_contextstruct amdgpu_device *adev;struct amdgpu_irq_src *irq_source; -const struct smu_funcs *funcs;const struct pptable_funcs *ppt_funcs;struct mutex mutex;struct mutex sensor_lock;
@@ -470,16 +469,12 @@ struct pptable_funcs { uint32_t dpm_level, uint32_t *freq);int (*set_df_cstate)(struct smu_context *smu,enum pp_df_cstate state);int (*update_pcie_parameters)(struct smu_context *smu,uint32_t pcie_gen_cap,uint32_t pcie_width_cap); -}; - -struct smu_funcs -{int (*init_microcode)(struct smu_context *smu); +int (*load_microcode)(struct smu_context *smu);int (*init_smc_tables)(struct smu_context *smu);int (*fini_smc_tables)(struct smu_context *smu);int (*init_power)(struct smu_context *smu);int (*fini_power)(struct smu_context *smu); -int (*load_microcode)(struct smu_context *smu);int (*check_fw_status)(struct smu_context *smu);int (*setup_pptable)(struct smu_context *smu);int (*get_vbios_bootup_values)(struct smu_context *smu);
@@ -510,8 +505,6 @@ struct smu_funcsint (*init_max_sustainable_clocks)(struct smu_context *smu);int (*start_thermal_control)(struct smu_context *smu);int (*stop_thermal_control)(struct smu_context *smu); -int (*read_sensor)(struct smu_context *smu,enum amd_pp_sensors sensor, -void *data,uint32_t *size);int (*set_deep_sleep_dcefclk)(struct smu_context *smu,uint32_t clk);int (*set_active_display_count)(struct smu_context *smu,uint32_t count); int (*store_cc6_data)(struct smu_context *smu, uint32_t separation_time,
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +126 -1
132 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +40 -1
46 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +53 -3
74 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +15 -0
@@ -561,6 +561,21 @@ static const struct pptable_funcs renoir_ppt_funcs = { .force_clk_levels = renoir_force_clk_levels, .set_power_profile_mode = renoir_set_power_profile_mode, .set_performance_level = renoir_set_performance_level, + .check_fw_status = smu_v12_0_check_fw_status, + .check_fw_version = smu_v12_0_check_fw_version, + .powergate_sdma = smu_v12_0_powergate_sdma, + .powergate_vcn = smu_v12_0_powergate_vcn, + .send_smc_msg = smu_v12_0_send_msg, + .send_smc_msg_with_param = smu_v12_0_send_msg_with_param, + .read_smc_arg = smu_v12_0_read_arg, + .set_gfx_cgpg = smu_v12_0_set_gfx_cgpg, + .gfx_off_control = smu_v12_0_gfx_off_control, + .init_smc_tables = smu_v12_0_init_smc_tables, + .fini_smc_tables = smu_v12_0_fini_smc_tables, + .populate_smc_tables = smu_v12_0_populate_smc_tables, + .get_dpm_ultimate_freq = smu_v12_0_get_dpm_ultimate_freq, + .mode2_reset = smu_v12_0_mode2_reset, + .set_soft_freq_limited_range = smu_v12_0_set_soft_freq_limited_range, };void renoir_set_ppt_funcs (struct smu_context *smu)
drivers/gpu/drm/amd/powerplay/smu_internal.h +42 -42
170 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +52 -137
506 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +18 -52
184 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +54 -3
75 lines not on this page · raw message
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Acked-by Alex DeucherQuoted 17 lines
-----Original Message-----
From: Quan, Evan <[email protected]>
Sent: Sunday, October 20, 2019 10:48 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Grodzovsky, Andrey <[email protected]>; Xu, Feifei <[email protected]>; Quan, Evan <[email protected]>; Grodzovsky, Andrey <[email protected]>; Xu, Feifei <[email protected]>
Subject: [PATCH 1/3] drm/amd/powerplay: add lock protection for swSMU APIs V2This is a quick and low risk fix. Those APIs which are exposed to other IPs or to support sysfs/hwmon interfaces or DAL will have lock protection. Meanwhile no lock protection is enforced for swSMU internal used APIs. Future optimization is needed.
Quoted 6 lines
V2: strip the lock protection for all swSMU internal APIs
Change-Id I8392652c9da1574a85acd9b171f04380f3630852Signed-off-by Evan Quan <[email protected]>Acked-by Feifei Xu <[email protected]>
Quoted 2,083 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 23 +- .../amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 4 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 696 ++++++++++++++++-- drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 3 - .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 163 ++-- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 15 +- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 14 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 22 +- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 3 - drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 20 +- 12 files changed, 777 insertions(+), 198 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +2
-1@@ -912,7 +912,8 @@ int amdgpu_dpm_get_sclk(struct amdgpu_device *adev, bool low)if (is_support_sw_smu (adev)) { ret =smu_get_dpm_freq_range (&adev->smu,SMU_GFXCLK , low ? &clk_freq :NULL , - !low ? &clk_freq :NULL ); + !low ? &clk_freq :NULL , + true);if (ret)drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +2
-1return 0 ;return clk_freq *100 ;@@ -930,7 +931,8 @@ int amdgpu_dpm_get_mclk(struct amdgpu_device *adev, bool low)if (is_support_sw_smu (adev)) { ret =smu_get_dpm_freq_range (&adev->smu,SMU_UCLK , low ? &clk_freq :NULL , - !low ? &clk_freq :NULL ); + !low ? &clk_freq :NULL , + true);if (ret)return 0 ;drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +0
-0return clk_freq *100 ;drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h +0
-6@@ -298,12 +298,6 @@ enum amdgpu_pcie_gen {#define amdgpu_dpm_get_current_power_state (adev) \ ((adev)->powerplay.pp_funcs- >get_current_power_state((adev)->powerplay.pp_handle)) -#define amdgpu_smu_get_current_power_state (adev) \ - ((adev)->smu.ppt_funcs- >get_current_power_state(&((adev)->smu))) - -#define amdgpu_smu_set_power_state (adev) \ - ((adev)->smu.ppt_funcs->set_power_state(&((adev)- >smu))) -#define
amdgpu_dpm_get_pp_num_states(adev, data)\
((adev)->powerplay.pp_funcs->get_pp_num_states((adev)-Quoted 1 line
powerplay.pp_handle, data))
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -211,7 +211,7 @@ static ssize_t amdgpu_get_dpm_state(struct device *dev, if (is_support_sw_smu(adev)) {if (adev->smu.ppt_funcs->get_current_power_state) - pm =amdgpu_smu_get_current_power_state (adev); + pm =smu_get_current_power_state (&adev->smu); elsedrivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1pm = adev->pm.dpm.user_state; }else if (adev->powerplay.pp_funcs->get_current_power_state) {@@ -957,7 +957,7 @@ static ssize_t amdgpu_set_pp_dpm_sclk(structdevice *dev, return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_SCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_SCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level)ret = amdgpu_dpm_force_clock_level(adev,
PP_SCLK,
mask);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -1004,7 +1004,7 @@ static ssize_t amdgpu_set_pp_dpm_mclk(structdevice *dev, return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_MCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_MCLK , mask, true);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +0
-0else if (adev->powerplay.pp_funcs->force_clock_level) ret = amdgpu_dpm_force_clock_level(adev, PP_MCLK,mask);
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -1044,7 +1044,7 @@ static ssize_t amdgpu_set_pp_dpm_socclk(structdevice *dev, return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_SOCCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_SOCCLK , mask, true);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +0
-0else if (adev->powerplay.pp_funcs->force_clock_level) ret = amdgpu_dpm_force_clock_level(adev, PP_SOCCLK,mask);
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -1084,7 +1084,7 @@ static ssize_t amdgpu_set_pp_dpm_fclk(structdevice *dev, return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_FCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_FCLK , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level)ret = amdgpu_dpm_force_clock_level(adev,
PP_FCLK,
mask);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -1124,7 +1124,7 @@ static ssize_t amdgpu_set_pp_dpm_dcefclk(structdevice *dev, return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_DCEFCLK , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_DCEFCLK , mask, true);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +0
-0else if (adev->powerplay.pp_funcs->force_clock_level) ret = amdgpu_dpm_force_clock_level(adev, PP_DCEFCLK,mask);
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -1164,7 +1164,7 @@ static ssize_t amdgpu_set_pp_dpm_pcie(structdevice *dev, return ret;if (is_support_sw_smu (adev)) - ret =smu_force_clk_levels (&adev->smu,SMU_PCIE , mask); + ret =smu_force_clk_levels (&adev->smu,SMU_PCIE , mask, true);else if (adev->powerplay.pp_funcs->force_clock_level)drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1ret =amdgpu_dpm_force_clock_level (adev,PP_PCIE , mask);@@ -1356,7 +1356,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, } parameter[parameter_size] = profile_mode;if (is_support_sw_smu (adev)) - ret =smu_set_power_profile_mode (&adev->smu, parameter, parameter_size); + ret =smu_set_power_profile_mode (&adev->smu, parameter, parameter_size, true);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +0
-0else if (adev->powerplay.pp_funcs->set_power_profile_mode) ret = amdgpu_dpm_set_power_profile_mode(adev,parameter,
parameter_size);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1if (!ret)@@ -2065,7 +2065,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_max(struct device *dev, uint32_t limit = 0;if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, true); +smu_get_power_limit (&adev->smu, &limit, true, true);return snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs-Quoted 1 line
get_power_limit) {adev->powerplay.pp_funcs->get_power_limit(adev-
Quoted 1 line
powerplay.pp_handle, &limit, true);
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +1
-1@@ -2083,7 +2083,7 @@ static ssize_t amdgpu_hwmon_show_power_cap(struct device *dev, uint32_t limit = 0;if (is_support_sw_smu (adev)) { -smu_get_power_limit (&adev->smu, &limit, false); +smu_get_power_limit (&adev->smu, &limit, false, true);return snprintf (buf,PAGE_SIZE ,"%u\n" , limit *1000000 ); } else if (adev->powerplay.pp_funcs && adev->powerplay.pp_funcs-Quoted 1 line
get_power_limit) {adev->powerplay.pp_funcs->get_power_limit(adev-
Quoted 1 line
powerplay.pp_handle, &limit, false);
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +2
-1@@ -3064,7 +3064,8 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev)struct smu_dpm_context *smu_dpm = &adev- >smu.smu_dpm;smu_handle_task (&adev->smu, smu_dpm->dpm_level, -AMD_PP_TASK_DISPLAY_CONFIG_CHANGE ); +AMD_PP_TASK_DISPLAY_CONFIG_CHANGE , + true);drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +0
-0}else {if (adev->powerplay.pp_funcs->dispatch_tasks) {if (!amdgpu_device_has_dc_support (adev)) {diff --git
a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.cb/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.cindex1352019648c0..ee9915d61cf1100644drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +0
-0@@ -876,7 +876,7 @@ enum pp_smu_statuspp_nv_get_maximum_sustainable_clocks(
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +0
-1if (!smu->funcs->get_max_sustainable_clocks_by_dc)return PP_SMU_RESULT_UNSUPPORTED ; - if (!smu->funcs->get_max_sustainable_clocks_by_dc(smu,
max_clocks))drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c +2
-1+if (!smu_get_max_sustainable_clocks_by_dc (smu, max_clocks))return PP_SMU_RESULT_OK ;return PP_SMU_RESULT_FAIL ;@@ -895,7 +895,7 @@ enum pp_smu_status pp_nv_get_uclk_dpm_states(struct pp_smu *pp, if (!smu->ppt_funcs->get_uclk_dpm_states) return PP_SMU_RESULT_UNSUPPORTED; -if (!smu->ppt_funcs->get_uclk_dpm_states (smu, +if (!smu_get_uclk_dpm_states (smu, clock_values_in_khz, num_states))return PP_SMU_RESULT_OK ;drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2
-0@@ -67,6 +67,8 @@ size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf)uint32_t sort_feature[SMU_FEATURE_COUNT ];uint64_t hw_feature_count =0 ; +mutex_lock (&smu->mutex); + ret =smu_feature_get_enabled_mask (smu, feature_mask,2 );if (ret)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +5
-1goto failed;@@ -92,6 +94,8 @@ size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf) } failed: +mutex_unlock (&smu->mutex); +return size; }@@ -149,9 +153,11 @@ int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask) uint64_t feature_2_disabled = 0;uint64_t feature_enables =0 ; +mutex_lock (&smu->mutex); + ret =smu_feature_get_enabled_mask (smu, feature_mask,2 );if (ret) -return ret; + goto out; feature_enables = ((uint64_t)feature_mask[1] << 32 |(uint64_t)feature_mask[0]);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +5
-2@@ -161,14 +167,17 @@ int smu_sys_set_pp_feature_mask(struct smu_context *smu, uint64_t new_mask) if (feature_2_enabled) { ret = smu_feature_update_enable_state(smu, feature_2_enabled, true);if (ret) -return ret; + goto out; }if (feature_2_disabled) { ret =smu_feature_update_enable_state (smu, feature_2_disabled, false);if (ret) -return ret; + goto out; } +out: +mutex_unlock (&smu->mutex); +drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-1return ret; }@@ -254,7 +263,7 @@ int smu_set_hard_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, }int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *min,uint32_t *max) +uint32_t *min,uint32_t *max,bool lock_needed) {drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3
-0uint32_t clock_limit;int ret =0 ;@@ -262,6 +271,9 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, if (!min && !max) return -EINVAL; +if (lock_needed) +mutex_lock (&smu->mutex); +if (!smu_clk_dpm_is_enabled (smu, clk_type)) {switch (clk_type) {drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3
-2case SMU_MCLK :@@ -285,14 +297,17 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, *min = clock_limit /100 ;if (max) *max = clock_limit /100 ; - -return 0 ; + }else { +/* +* Todo: Use each asic(ASIC_ppt funcs) control the callbacks exposed to the
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-0+* core driver and then have helpers for stuff that is
common(SMU_v11_x | SMU_v12_x funcs).drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2
-0+*/ + ret = smu_get_dpm_ultimate_freq(smu, clk_type, min,max);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-2} -/* -* Todo: Use each asic(ASIC_ppt funcs) control the callbacks exposed to the
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-1-* core driver and then have helpers for stuff that is
common(SMU_v11_x | SMU_v12_x funcs).drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +6
-2-*/ - ret =smu_get_dpm_ultimate_freq (smu, clk_type, min, max); + +if (lock_needed) +mutex_unlock (&smu->mutex); +return ret; }@@ -369,6 +384,8 @@ int smu_dpm_set_power_gate(struct smu_context *smu, uint32_t block_type, {int ret =0 ; +mutex_lock (&smu->mutex); +switch (block_type) {case AMD_IP_BLOCK_TYPE_UVD :drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2
-6ret =smu_dpm_set_uvd_enable (smu, gate);@@ -386,13 +403,9 @@ int smu_dpm_set_power_gate(struct smu_context *smu, uint32_t block_type, break; } -return ret; -} +mutex_unlock (&smu->mutex); -enum amd_pm_state_type smu_get_current_power_state (struct smu_context *smu) -{ -/* not support power state */ -return POWER_STATE_TYPE_DEFAULT ; +return ret; }int smu_get_power_num_states(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +8
-1@@ -520,16 +533,23 @@ bool is_support_sw_smu_xgmi(struct amdgpu_device *adev)int smu_sys_get_pp_table (struct smu_context *smu,void **table) {struct smu_table_context *smu_table = &smu->smu_table; +uint32_t powerplay_table_size;if (!smu_table->power_play_table && !smu_table- >hardcode_pptable)return -EINVAL ; +mutex_lock (&smu->mutex); +if (smu_table->hardcode_pptable) *table = smu_table->hardcode_pptable;else *table = smu_table->power_play_table; -return smu_table->power_play_table_size; + powerplay_table_size = smu_table->power_play_table_size; + +mutex_unlock (&smu->mutex); + +return powerplay_table_size; }int
smu_sys_set_pp_table(struct smu_context *smu, void *buf, size_t size)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-3@@ -556,14 +576,11 @@ int smu_sys_set_pp_table(struct smu_context *smu, void *buf, size_t size)memcpy (smu_table->hardcode_pptable, buf, size); smu_table->power_play_table = smu_table->hardcode_pptable; smu_table->power_play_table_size = size; -mutex_unlock (&smu->mutex); ret =smu_reset (smu);if (ret)pr_info ("smu reset failed, ret = %d\n" , ret); -return ret; - failed:mutex_unlock (&smu->mutex);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3
-4return ret;@@ -726,11 +743,10 @@ static int smu_late_init(void *handle)if (!smu->pm_enabled)return 0 ; -mutex_lock (&smu->mutex);smu_handle_task (&adev->smu, smu->smu_dpm.dpm_level, -AMD_PP_TASK_COMPLETE_INIT ); -mutex_unlock (&smu->mutex); +AMD_PP_TASK_COMPLETE_INIT , + false);return 0 ; }@@ -1074,7 +1090,7 @@ static int smu_smc_table_hw_init(structsmu_context *smu, if (ret) return ret; - ret =smu_get_power_limit (smu, &smu- >default_power_limit, true); + ret =smu_get_power_limit (smu, &smu- >default_power_limit, true, false);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +10
-6if (ret)return ret; }@@ -1160,15 +1176,19 @@ static int smu_start_smc_engine(struct smu_context *smu)if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) {if (adev->asic_type <CHIP_NAVI10 ) { - ret =smu_load_microcode (smu); -if (ret) -return ret; +if (smu->funcs->load_microcode) { + ret = smu->funcs->load_microcode (smu); +if (ret) +return ret; + } } } - ret =smu_check_fw_status (smu); -if (ret) -pr_err ("SMC is not ready\n" ); +if (smu->funcs->check_fw_status) { + ret = smu->funcs->check_fw_status (smu); +if (ret) +pr_err ("SMC is not ready\n" ); + }return ret;}
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +4
-7@@ -1334,8 +1354,6 @@ static int smu_resume(void *handle)pr_info ("SMU is resuming...\n" ); -mutex_lock (&smu->mutex); - ret =smu_start_smc_engine (smu);if (ret) {pr_err ("SMU is not ready yet!\n" );@@ -1350,13 +1368,11 @@ static int smu_resume(void *handle)if (ret) goto failed; -mutex_unlock (&smu->mutex); -pr_info ("SMU is resumed successfully!\n" );return 0 ; + failed: -mutex_unlock (&smu->mutex);return ret; }@@ -1374,8 +1390,9 @@ int smu_display_configuration_change(struct smu_context *smu,mutex_lock (&smu->mutex); -smu_set_deep_sleep_dcefclk (smu, - display_config- >min_dcef_deep_sleep_set_clk / 100); +if (smu->funcs->set_deep_sleep_dcefclk) + smu->funcs->set_deep_sleep_dcefclk (smu, + display_config- >min_dcef_deep_sleep_set_clk / 100);for (index = 0; index < display_config-
Quoted 1 line
num_path_including_non_display; index++) {drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-0if (display_config->displays[index].controller_id !=0 )@@ -1553,9 +1570,9 @@ static intsmu_default_set_performance_level(struct
smu_context*smu, enumamd_ddrivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-3&soc_mask);if (ret)return ret; -smu_force_clk_levels (smu,SMU_SCLK ,1 << sclk_mask); -smu_force_clk_levels (smu,SMU_MCLK ,1 << mclk_mask); -smu_force_clk_levels (smu,SMU_SOCCLK ,1 << soc_mask); + smu_force_clk_levels(smu, SMU_SCLK, 1 << sclk_mask,false);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-0+ smu_force_clk_levels(smu, SMU_MCLK, 1 << mclk_mask,false);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-0+ smu_force_clk_levels(smu, SMU_SOCCLK, 1 << soc_mask,false);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1
-1break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :@@ -1619,7 +1636,7 @@ int smu_adjust_power_state_dynamic(structsmu_context *smu, workload = smu->workload_setting[index];if (smu->power_profile_mode != workload) -smu_set_power_profile_mode (smu, &workload,0 ); +smu_set_power_profile_mode (smu, &workload,0 , false); }drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-3return ret;@@ -1627,18 +1644,22 @@ int smu_adjust_power_state_dynamic(structsmu_context *smu, int smu_handle_task(struct smu_context *smu, enum amd_dpm_forced_level level, - enum amd_pp_task task_id) + enum amd_pp_task task_id, + bool lock_needed) { int ret = 0; +if (lock_needed) +mutex_lock (&smu->mutex); +switch (task_id) {case AMD_PP_TASK_DISPLAY_CONFIG_CHANGE : ret =smu_pre_display_config_changed (smu);if (ret) -return ret; + goto out; ret =smu_set_cpu_power_state (smu);if (ret) -return ret; + goto out; ret =smu_adjust_power_state_dynamic (smu, level, false);break ;drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +5
-1case AMD_PP_TASK_COMPLETE_INIT :@@ -1649,6 +1670,10 @@ int smu_handle_task(struct smu_context *smu,break ; } +out: +if (lock_needed) +mutex_unlock (&smu->mutex); +return ret; }@@ -1681,7 +1706,7 @@ int smu_switch_power_profile(struct smu_context *smu, }if (smu_dpm_ctx->dpm_level !=AMD_DPM_FORCED_LEVEL_MANUAL ) -smu_set_power_profile_mode (smu, &workload,0 ); +smu_set_power_profile_mode (smu, &workload,0 , false);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-0mutex_unlock (&smu->mutex);@@ -1711,12 +1736,19 @@ int smu_force_performance_level(struct
smu_context*smu, enumamd_dpm_forced_levdrivers/gpu/drm/amd/powerplay/amdgpu_smu.c +11
-3if (!smu->is_apu && !smu_dpm_ctx->dpm_context)return -EINVAL ; +mutex_lock (&smu->mutex); + ret =smu_enable_umd_pstate (smu, &level); -if (ret) +if (ret) { +mutex_unlock (&smu->mutex);return ret; + } ret =smu_handle_task (smu, level, -AMD_PP_TASK_READJUST_POWER_STATE ); +AMD_PP_TASK_READJUST_POWER_STATE , + false); + +mutex_unlock (&smu->mutex);return ret; }@@ -1734,7 +1766,8 @@ int smu_set_display_count(struct smu_context *smu, uint32_t count)int smu_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t mask) +uint32_t mask, +bool lock_needed) {struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +6
-0int ret =0 ;@@ -1744,9 +1777,15 @@ int smu_force_clk_levels(struct smu_context *smu, return -EINVAL ; } +if (lock_needed) +mutex_lock (&smu->mutex); +if (smu->ppt_funcs && smu->ppt_funcs->force_clk_levels) ret = smu->ppt_funcs->force_clk_levels (smu, clk_type, mask); +if (lock_needed) +mutex_unlock (&smu->mutex); +return ret;}
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +12
-1@@ -1764,6 +1803,8 @@ int smu_set_mp1_state(struct smu_context *smu,if (!smu->pm_enabled)return 0 ; +mutex_lock (&smu->mutex); +switch (mp1_state) {case PP_MP1_STATE_SHUTDOWN : msg = SMU_MSG_PrepareMp1ForShutdown;@@ -1776,17 +1817,22 @@ int smu_set_mp1_state(struct smu_context *smu, break;case PP_MP1_STATE_NONE :default : +mutex_unlock (&smu->mutex);return 0 ; }/* some asics may not support those messages */ -if (smu_msg_get_index (smu, msg) <0 ) +if (smu_msg_get_index (smu, msg) <0 ) { +mutex_unlock (&smu->mutex);return 0 ; + } ret =smu_send_smc_msg (smu, msg);if (ret)pr_err ("[PrepareMp1] Failed!\n" ); +mutex_unlock (&smu->mutex); +return ret; }@@ -1806,10 +1852,14 @@ int smu_set_df_cstate(struct smu_context *smu, if (!smu->ppt_funcs || !smu->ppt_funcs->set_df_cstate)return 0 ; +mutex_lock (&smu->mutex); + ret = smu->ppt_funcs->set_df_cstate (smu, state);if (ret)pr_err ("[SetDfCstate] failed!\n" ); +mutex_unlock (&smu->mutex); +return ret; }@@ -1849,3 +1899,549 @@ const struct amdgpu_ip_block_version
smu_v12_0_ip_block=drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +91
-0.rev = 0, .funcs = &smu_ip_funcs, }; + +int smu_load_microcode (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->load_microcode) + ret = smu->funcs->load_microcode (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_check_fw_status (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->check_fw_status) + ret = smu->funcs->check_fw_status (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_gfx_cgpg (struct smu_context *smu,bool enabled) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_gfx_cgpg) + ret = smu->funcs->set_gfx_cgpg (smu, enabled); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_fan_speed_rpm) + ret = smu->funcs->set_fan_speed_rpm (smu, speed); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_power_limit (struct smu_context *smu, +uint32_t *limit, +bool def, +bool lock_needed) +{ +int ret =0 ; + +if (lock_needed) +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_power_limit) + ret = smu->ppt_funcs->get_power_limit (smu, limit, def); + +if (lock_needed) +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_power_limit (struct smu_context *smu,uint32_t limit) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_power_limit) + ret = smu->funcs->set_power_limit (smu, limit); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_print_clk_levels(struct smu_context *smu, enum smu_clk_type
clk_type, char *buf)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +14
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->print_clk_levels) + ret = smu->ppt_funcs->print_clk_levels (smu, clk_type, buf); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_od_percentage(struct smu_context *smu, enum
smu_clk_typetype)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +14
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_od_percentage) + ret = smu->ppt_funcs->get_od_percentage (smu, type); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_od_percentage(struct smu_context *smu, enum
smu_clk_typetype,uint32_tvalue)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->set_od_percentage) + ret = smu->ppt_funcs->set_od_percentage(smu, type,value);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +16
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_od_edit_dpm_table (struct smu_context *smu, +enum PP_OD_DPM_TABLE_COMMAND type, +long *input,uint32_t size) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->od_edit_dpm_table) + ret = smu->ppt_funcs->od_edit_dpm_table(smu, type,input, size);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +16
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_read_sensor (struct smu_context *smu, +enum amd_pp_sensors sensor, +void *data,uint32_t *size) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->read_sensor) + ret = smu->ppt_funcs->read_sensor(smu, sensor, data,size);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +32
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_power_profile_mode (struct smu_context *smu,char *buf) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_power_profile_mode) + ret = smu->ppt_funcs->get_power_profile_mode (smu, buf); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_power_profile_mode (struct smu_context *smu, +long *param, +uint32_t param_size, +bool lock_needed) +{ +int ret =0 ; + +if (lock_needed) +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->set_power_profile_mode) + ret = smu->ppt_funcs->set_power_profile_mode(smu,param,
param_size);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +37
-0+ +if (lock_needed) +mutex_unlock (&smu->mutex); + +return ret; +} + + +int smu_get_fan_control_mode (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->get_fan_control_mode) + ret = smu->funcs->get_fan_control_mode (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_fan_control_mode (struct smu_context *smu,int value) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_fan_control_mode) + ret = smu->funcs->set_fan_control_mode (smu, value); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t*speed)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_fan_speed_percent) + ret = smu->ppt_funcs->get_fan_speed_percent(smu,speed);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_fan_speed_percent(struct smu_context *smu, uint32_tspeed)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +42
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_fan_speed_percent) + ret = smu->funcs->set_fan_speed_percent (smu, speed); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_fan_speed_rpm (struct smu_context *smu,uint32_t *speed) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_fan_speed_rpm) + ret = smu->ppt_funcs->get_fan_speed_rpm (smu, speed); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_deep_sleep_dcefclk (struct smu_context *smu,int clk) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_deep_sleep_dcefclk) + ret = smu->funcs->set_deep_sleep_dcefclk (smu, clk); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_active_display_count(struct smu_context *smu, uint32_tcount)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +47
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_active_display_count) + ret = smu->funcs->set_active_display_count (smu, count); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_clock_by_type (struct smu_context *smu, +enum amd_pp_clock_type type, +struct amd_pp_clocks *clocks) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->get_clock_by_type) + ret = smu->funcs->get_clock_by_type (smu, type, clocks); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_max_high_clocks (struct smu_context *smu, +struct amd_pp_simple_clock_info *clocks) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->get_max_high_clocks) + ret = smu->funcs->get_max_high_clocks (smu, clocks); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_clock_by_type_with_latency (struct smu_context *smu, +enum smu_clk_type clk_type, + struct pp_clock_levels_with_latency*clocks)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_clock_by_type_with_latency) + ret = smu->ppt_funcs-Quoted 1 line
get_clock_by_type_with_latency(smu, clk_type, clocks);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +9
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_clock_by_type_with_voltage (struct smu_context *smu, +enum amd_pp_clock_type type, + struct pp_clock_levels_with_voltage*clocks)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_clock_by_type_with_voltage) + ret = smu->ppt_funcs-Quoted 1 line
get_clock_by_type_with_voltage(smu, type, clocks);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +9
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + + +int smu_display_clock_voltage_request (struct smu_context *smu, + struct pp_display_clock_request
*clock_req)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->display_clock_voltage_request) + ret = smu->funcs->display_clock_voltage_request(smu,
clock_req);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +8
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + + +int smu_display_disable_memory_clock_switch(struct smu_context *smu,bool
disable_memory_clock_switch)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret = -EINVAL ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->display_disable_memory_clock_switch) + ret = smu->ppt_funcs-Quoted 1 line
display_disable_memory_clock_switch(smu,
disable_memory_clock_switch);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +22
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_notify_smu_enable_pwe (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->notify_smu_enable_pwe) + ret = smu->funcs->notify_smu_enable_pwe (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_watermarks_for_clock_ranges(struct smu_context *smu, + struct
dm_pp_wm_sets_with_clock_ranges_soc15*clock_ranges)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_watermarks_for_clock_ranges) + ret = smu->funcs->set_watermarks_for_clock_ranges(smu,
clock_ranges);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +50
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_xgmi_pstate (struct smu_context *smu, +uint32_t pstate) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_xgmi_pstate) + ret = smu->funcs->set_xgmi_pstate (smu, pstate); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_set_azalia_d3_pme (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->set_azalia_d3_pme) + ret = smu->funcs->set_azalia_d3_pme (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +bool smu_baco_is_support (struct smu_context *smu) +{ +bool ret = false; + +mutex_lock (&smu->mutex); + +if (smu->funcs->baco_is_support) + ret = smu->funcs->baco_is_support (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state*state)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +41
-0+{ +if (smu->funcs->baco_get_state) +return -EINVAL ; + +mutex_lock (&smu->mutex); + *state = smu->funcs->baco_get_state (smu); +mutex_unlock (&smu->mutex); + +return 0 ; +} + +int smu_baco_reset (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->baco_reset) + ret = smu->funcs->baco_reset (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_mode2_reset (struct smu_context *smu) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->mode2_reset) + ret = smu->funcs->mode2_reset (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_max_sustainable_clocks_by_dc (struct smu_context *smu, + struct pp_smu_nv_clock_table
*max_clocks)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->funcs->get_max_sustainable_clocks_by_dc) + ret = smu->funcs->get_max_sustainable_clocks_by_dc(smu,
max_clocks);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +16
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_get_uclk_dpm_states (struct smu_context *smu, +unsigned int *clock_values_in_khz, +unsigned int *num_states) +{ +int ret =0 ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_uclk_dpm_states) + ret = smu->ppt_funcs->get_uclk_dpm_states(smu,
clock_values_in_khz,num_states);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +7
-0+ +mutex_unlock (&smu->mutex); + +return ret; +} + +enum amd_pm_state_type smu_get_current_power_state(struct
smu_context*smu)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +2
-0+{ + enum amd_pm_state_type pm_state =
POWER_STATE_TYPE_DEFAULT;drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +5
-0+ +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->get_current_power_state) + pm_state = smu->ppt_funcs-Quoted 1 line
get_current_power_state(smu);drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +5
-0+ +mutex_unlock (&smu->mutex); + +return pm_state; +}drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0
-3@@ -772,8 +772,6 @@ static int arcturus_force_clk_levels(structsmu_context *smu, uint32_t soft_min_level, soft_max_level;int ret =0 ; -mutex_lock (&(smu->mutex)); - soft_min_level = mask ? (ffs (mask) -1 ) :0 ; soft_max_level = mask ? (fls (mask) -1 ) :0 ;@@ -892,7 +890,6 @@ static int arcturus_force_clk_levels(structsmu_context *smu, break; } -mutex_unlock (&(smu->mutex));return ret; }drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-4@@ -565,18 +565,17 @@ struct smu_funcs ((smu)->funcs->init_power ? (smu)->funcs->init_power((smu)) : 0)#define smu_fini_power (smu) \ ((smu)->funcs->fini_power ? (smu)->funcs->fini_power((smu)) : 0) -#define smu_load_microcode (smu) \ - ((smu)->funcs->load_microcode ? (smu)->funcs- >load_microcode((smu)) : 0) -#define smu_check_fw_status (smu) \ - ((smu)->funcs->check_fw_status ? (smu)->funcs- >check_fw_status((smu)) : 0) +int smu_load_microcode (struct smu_context *smu); + +int smu_check_fw_status (struct smu_context *smu); +#define smu_setup_pptable (smu) \ ((smu)->funcs->setup_pptable ? (smu)->funcs- >setup_pptable((smu)) : 0)#define smu_powergate_sdma (smu, gate) \ ((smu)->funcs->powergate_sdma ? (smu)->funcs- >powergate_sdma((smu), (gate)) : 0)#define smu_powergate_vcn (smu, gate) \ ((smu)->funcs->powergate_vcn ? (smu)->funcs-Quoted 1 line
powergate_vcn((smu), (gate)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_gfx_cgpg (smu, enabled) \ - ((smu)->funcs->set_gfx_cgpg ? (smu)->funcs->set_gfx_cgpg((smu),(enabled)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-0+int smu_set_gfx_cgpg (struct smu_context *smu,bool enabled);#define smu_get_vbios_bootup_values (smu) \ ((smu)->funcs->get_vbios_bootup_values ? (smu)->funcs-Quoted 1 line
get_vbios_bootup_values((smu)) : 0)
#define
smu_get_clk_info_from_vbios(smu)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2
-2@@ -610,8 +609,8 @@ struct smu_funcs ((smu)->funcs->init_max_sustainable_clocks ? (smu)->funcs- >init_max_sustainable_clocks((smu)) : 0)#define smu_set_default_od_settings (smu, initialize) \ ((smu)->ppt_funcs->set_default_od_settings ? (smu)->ppt_funcs- >set_default_od_settings((smu), (initialize)) : 0) -#define smu_set_fan_speed_rpm (smu, speed) \ - ((smu)->funcs->set_fan_speed_rpm ? (smu)->funcs- >set_fan_speed_rpm((smu), (speed)) : 0) +int smu_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed); +#define
smu_send_smc_msg(smu, msg)\
((smu)->funcs->send_smc_msg? (smu)->funcs-Quoted 1 line
send_smc_msg((smu), (msg)): 0)#define
smu_send_smc_msg_with_param(smu, msg, param)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +7
-10@@ -642,20 +641,22 @@ struct smu_funcs ((smu)->ppt_funcs->populate_umd_state_clk ? (smu)->ppt_funcs- >populate_umd_state_clk((smu)) : 0)#define smu_set_default_od8_settings (smu) \ ((smu)->ppt_funcs->set_default_od8_settings ? (smu)->ppt_funcs- >set_default_od8_settings((smu)) : 0) -#define smu_get_power_limit (smu, limit, def) \ - ((smu)->ppt_funcs->get_power_limit ? (smu)->ppt_funcs- >get_power_limit((smu), (limit), (def)) : 0) -#define smu_set_power_limit (smu, limit) \ - ((smu)->funcs->set_power_limit ? (smu)->funcs- >set_power_limit((smu), (limit)) : 0) + +int smu_get_power_limit (struct smu_context *smu, +uint32_t *limit, +bool def, +bool lock_needed); + +int smu_set_power_limit (struct smu_context *smu,uint32_t limit);#define smu_get_current_clk_freq (smu, clk_id, value) \ ((smu)->funcs->get_current_clk_freq? (smu)->funcs- >get_current_clk_freq((smu), (clk_id), (value)) : 0) -#define smu_print_clk_levels (smu, clk_type, buf) \ - ((smu)->ppt_funcs->print_clk_levels ? (smu)->ppt_funcs- >print_clk_levels((smu), (clk_type), (buf)) : 0) -#define smu_get_od_percentage (smu, type) \ - ((smu)->ppt_funcs->get_od_percentage ? (smu)->ppt_funcs- >get_od_percentage((smu), (type)) : 0) -#define smu_set_od_percentage (smu, type, value) \ - ((smu)->ppt_funcs->set_od_percentage ? (smu)->ppt_funcs-Quoted 1 line
set_od_percentage((smu), (type), (value)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_od_edit_dpm_table (smu, type, input, size) \ - ((smu)->ppt_funcs->od_edit_dpm_table ? (smu)->ppt_funcs-Quoted 1 line
od_edit_dpm_table((smu), (type), (input), (size)): 0)+int
smu_print_clk_levels(struct smu_context *smu, enum smu_clk_type clk_type, char *buf);
+intsmu_get_od_percentage(struct smu_context *smu, enum smu_clk_type type);
+intsmu_set_od_percentage(struct smu_context *smu, enum smu_clk_type type, uint32_t value);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-0+ +int smu_od_edit_dpm_table (struct smu_context *smu, +enum PP_OD_DPM_TABLE_COMMAND type, +long *input,uint32_t size);#define smu_tables_init (smu, tab) \ ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs-Quoted 1 line
tables_init((smu), (tab)): 0)#define
smu_set_thermal_fan_table(smu)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-6@@ -664,14 +665,18 @@ struct smu_funcs ((smu)->funcs->start_thermal_control? (smu)->funcs- >start_thermal_control((smu)) : 0)#define smu_stop_thermal_control (smu) \ ((smu)->funcs->stop_thermal_control? (smu)->funcs- >stop_thermal_control((smu)) : 0) -#define smu_read_sensor (smu, sensor, data, size) \ - ((smu)->ppt_funcs->read_sensor? (smu)->ppt_funcs- >read_sensor((smu), (sensor), (data), (size)) : 0) + +int smu_read_sensor (struct smu_context *smu, +enum amd_pp_sensors sensor, +void *data,uint32_t *size);#define smu_smc_read_sensor (smu, sensor, data, size) \ ((smu)->funcs->read_sensor? (smu)->funcs->read_sensor((smu), (sensor), (data), (size)) : -EINVAL) -#define smu_get_power_profile_mode (smu, buf) \ - ((smu)->ppt_funcs->get_power_profile_mode ? (smu)->ppt_funcs- >get_power_profile_mode((smu), buf) : 0) -#define smu_set_power_profile_mode (smu, param, param_size) \ - ((smu)->ppt_funcs->set_power_profile_mode ? (smu)->ppt_funcs-Quoted 1 line
set_power_profile_mode((smu), (param), (param_size)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +6
-0+int smu_get_power_profile_mode (struct smu_context *smu,char *buf); + +int smu_set_power_profile_mode (struct smu_context *smu, +long *param, +uint32_t param_size, +bool lock_needed);#define smu_pre_display_config_changed (smu) \ ((smu)->ppt_funcs->pre_display_config_changed ? (smu)-Quoted 1 line
ppt_funcs->pre_display_config_changed((smu)) : 0)
#define
smu_display_config_changed(smu)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-8@@ -688,16 +693,11 @@ struct smu_funcs ((smu)->ppt_funcs->get_profiling_clk_mask ? (smu)->ppt_funcs- >get_profiling_clk_mask((smu), (level), (sclk_mask), (mclk_mask), (soc_mask)) : 0)#define smu_set_cpu_power_state (smu) \ ((smu)->ppt_funcs->set_cpu_power_state ? (smu)->ppt_funcs- >set_cpu_power_state((smu)) : 0) -#define smu_get_fan_control_mode (smu) \ - ((smu)->funcs->get_fan_control_mode ? (smu)->funcs- >get_fan_control_mode((smu)) : 0) -#define smu_set_fan_control_mode (smu, value) \ - ((smu)->funcs->set_fan_control_mode ? (smu)->funcs- >set_fan_control_mode((smu), (value)) : 0) -#define smu_get_fan_speed_percent (smu, speed) \ - ((smu)->ppt_funcs->get_fan_speed_percent ? (smu)->ppt_funcs- >get_fan_speed_percent((smu), (speed)) : 0) -#define smu_set_fan_speed_percent (smu, speed) \ - ((smu)->funcs->set_fan_speed_percent ? (smu)->funcs-Quoted 1 line
set_fan_speed_percent((smu), (speed)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_fan_speed_rpm (smu, speed) \ - ((smu)->ppt_funcs->get_fan_speed_rpm ? (smu)->ppt_funcs-Quoted 1 line
get_fan_speed_rpm((smu), (speed)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +3
-0+int smu_get_fan_control_mode (struct smu_context *smu); +int smu_set_fan_control_mode (struct smu_context *smu,int value); +int smu_get_fan_speed_percent(struct smu_context *smu, uint32_t*speed);
+intsmu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-0+int smu_get_fan_speed_rpm (struct smu_context *smu,uint32_t *speed);#define smu_msg_get_index (smu, msg) \ ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_smu_msg_index?(smu)->ppt_funcs->get_smu_msg_index((smu), (msg)) :
-EINVAL) : - EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0@@ -715,40 +715,46 @@ struct smu_funcs ((smu)->ppt_funcs? ((smu)->ppt_funcs->run_btc? (smu)- >ppt_funcs->run_btc((smu)) : 0) : 0)#define smu_get_allowed_feature_mask (smu, feature_mask, num) \ ((smu)->ppt_funcs? ((smu)->ppt_funcs-Quoted 2 lines
get_allowed_feature_mask? (smu)->ppt_funcs-get_allowed_feature_mask((smu), (feature_mask), (num)): 0) : 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_deep_sleep_dcefclk (smu, clk) \ - ((smu)->funcs->set_deep_sleep_dcefclk ? (smu)->funcs-Quoted 1 line
set_deep_sleep_dcefclk((smu), (clk)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_active_display_count (smu, count) \ - ((smu)->funcs->set_active_display_count ? (smu)->funcs-Quoted 1 line
set_active_display_count((smu), (count)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2
-0+int smu_set_deep_sleep_dcefclk (struct smu_context *smu,int clk); +int smu_set_active_display_count(struct smu_context *smu, uint32_tcount);
#definesmu_store_cc6_data(smu, st, cc6_dis, pst_dis, pst_sw_dis)\
((smu)->funcs->store_cc6_data ? (smu)->funcs-Quoted 1 line
store_cc6_data((smu), (st), (cc6_dis), (pst_dis), (pst_sw_dis)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_clock_by_type (smu, type, clocks) \ - ((smu)->funcs->get_clock_by_type ? (smu)->funcs-Quoted 1 line
get_clock_by_type((smu), (type), (clocks)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_max_high_clocks (smu, clocks) \ - ((smu)->funcs->get_max_high_clocks ? (smu)->funcs-Quoted 1 line
get_max_high_clocks((smu), (clocks)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_clock_by_type_with_latency (smu, clk_type, clocks) \ - ((smu)->ppt_funcs->get_clock_by_type_with_latency ? (smu)-Quoted 1 line
ppt_funcs->get_clock_by_type_with_latency((smu), (clk_type), (clocks)):0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_get_clock_by_type_with_voltage (smu, type, clocks) \ - ((smu)->ppt_funcs->get_clock_by_type_with_voltage ? (smu)-Quoted 1 line
ppt_funcs->get_clock_by_type_with_voltage((smu), (type), (clocks)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_display_clock_voltage_request (smu, clock_req) \ - ((smu)->funcs->display_clock_voltage_request ? (smu)->funcs-Quoted 1 line
display_clock_voltage_request((smu), (clock_req)): 0)-#define
smu_display_disable_memory_clock_switch(smu, disable_memory_clock_switch)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-1- ((smu)->ppt_funcs->display_disable_memory_clock_switch ? (smu)-Quoted 1 line
ppt_funcs->display_disable_memory_clock_switch((smu),
(
disable_memory_clock_switch)) :-EINVAL)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +11
-0+ +int smu_get_clock_by_type (struct smu_context *smu, +enum amd_pp_clock_type type, +struct amd_pp_clocks *clocks); + +int smu_get_max_high_clocks (struct smu_context *smu, +struct amd_pp_simple_clock_info *clocks); + +int smu_get_clock_by_type_with_latency (struct smu_context *smu, +enum smu_clk_type clk_type, + struct pp_clock_levels_with_latency*clocks);
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-0+ +int smu_get_clock_by_type_with_voltage (struct smu_context *smu, +enum amd_pp_clock_type type, + struct pp_clock_levels_with_voltage*clocks);
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +3
-0+ +int smu_display_clock_voltage_request (struct smu_context *smu, + struct pp_display_clock_request
*clock_req);
+intsmu_display_disable_memory_clock_switch(struct smu_context *smu, bool disable_memory_clock_switch);
#definesmu_get_dal_power_level(smu, clocks)\
((smu)->funcs->get_dal_power_level ? (smu)->funcs-Quoted 1 line
get_dal_power_level((smu), (clocks)): 0)#define
smu_get_perf_level(smu, designation, level)\
((smu)->funcs->get_perf_level ? (smu)->funcs-Quoted 1 line
get_perf_level((smu), (designation), (level)): 0)#define
smu_get_current_shallow_sleep_clocks(smu, clocks)\
((smu)->funcs->get_current_shallow_sleep_clocks ? (smu)->funcs-Quoted 1 line
get_current_shallow_sleep_clocks((smu), (clocks)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_notify_smu_enable_pwe (smu) \ - ((smu)->funcs->notify_smu_enable_pwe ? (smu)->funcs-Quoted 1 line
notify_smu_enable_pwe((smu)) : 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_watermarks_for_clock_ranges (smu, clock_ranges) \ - ((smu)->funcs->set_watermarks_for_clock_ranges ? (smu)->funcs-Quoted 1 line
set_watermarks_for_clock_ranges((smu), (clock_ranges)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-0+int smu_notify_smu_enable_pwe (struct smu_context *smu); + +int smu_set_watermarks_for_clock_ranges(struct smu_context *smu, + struct
dm_pp_wm_sets_with_clock_ranges_soc15*clock_ranges);
#definesmu_dpm_set_uvd_enable(smu, enable)\
((smu)->ppt_funcs->dpm_set_uvd_enable ? (smu)->ppt_funcs-Quoted 1 line
dpm_set_uvd_enable((smu), (enable)): 0)#define
smu_dpm_set_vce_enable(smu, enable)\
((smu)->ppt_funcs->dpm_set_vce_enable ? (smu)->ppt_funcs-Quoted 1 line
dpm_set_vce_enable((smu), (enable)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#define smu_set_xgmi_pstate (smu, pstate) \ - ((smu)->funcs->set_xgmi_pstate ? (smu)->funcs-Quoted 1 line
set_xgmi_pstate((smu), (pstate)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +3
-0+ +int smu_set_xgmi_pstate (struct smu_context *smu, +uint32_t pstate);#define smu_set_watermarks_table (smu, tab, clock_ranges) \ ((smu)->ppt_funcs->set_watermarks_table ? (smu)->ppt_funcs-Quoted 1 line
set_watermarks_table((smu), (tab), (clock_ranges)): 0)#define
smu_get_current_clk_freq_by_table(smu, clk_type, value)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2
-10@@ -759,22 +765,18 @@ struct smu_funcs ((smu)->ppt_funcs->get_thermal_temperature_range? (smu)- >ppt_funcs->get_thermal_temperature_range((smu), (range)) : 0)#define smu_register_irq_handler (smu) \ ((smu)->funcs->register_irq_handler ? (smu)->funcs- >register_irq_handler(smu) : 0) -#define smu_set_azalia_d3_pme (smu) \ - ((smu)->funcs->set_azalia_d3_pme ? (smu)->funcs- >set_azalia_d3_pme((smu)) : 0) + +int smu_set_azalia_d3_pme (struct smu_context *smu);#define smu_get_dpm_ultimate_freq (smu, param, min, max) \ ((smu)->funcs->get_dpm_ultimate_freq ? (smu)->funcs- >get_dpm_ultimate_freq((smu), (param), (min), (max)) : 0) -#define smu_get_uclk_dpm_states (smu, clocks_in_khz, num_states) \ - ((smu)->ppt_funcs->get_uclk_dpm_states ? (smu)->ppt_funcs- >get_uclk_dpm_states((smu), (clocks_in_khz), (num_states)) : 0) -#define smu_get_max_sustainable_clocks_by_dc (smu, max_clocks) \ - ((smu)->funcs->get_max_sustainable_clocks_by_dc ? (smu)->funcs- >get_max_sustainable_clocks_by_dc((smu), (max_clocks)) : 0) -#define smu_baco_is_support (smu) \ - ((smu)->funcs->baco_is_support? (smu)->funcs- >baco_is_support((smu)) : false) -#define smu_baco_get_state (smu, state) \ - ((smu)->funcs->baco_get_state? (smu)->funcs-Quoted 1 line
baco_get_state((smu), (state)): 0)drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-4-#define smu_baco_reset (smu) \ - ((smu)->funcs->baco_reset? (smu)->funcs->baco_reset((smu)) : 0) -#define smu_mode2_reset (smu) \ - ((smu)->funcs->mode2_reset? (smu)->funcs->mode2_reset((smu)): 0)
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-0+ +bool smu_baco_is_support (struct smu_context *smu); + +int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state*state);
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-0+ +int smu_baco_reset (struct smu_context *smu); + +int smu_mode2_reset (struct smu_context *smu);#define smu_asic_set_performance_level (smu, level) \ ((smu)->ppt_funcs->set_performance_level? (smu)->ppt_funcs-Quoted 1 line
set_performance_level((smu), (level)):-EINVAL);#define
smu_dump_pptable(smu)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2
-1@@ -833,7 +835,8 @@ extern int smu_get_current_clocks(structsmu_context *smu, extern int smu_dpm_set_power_gate(struct smu_context *smu,uint32_t block_type,bool gate);extern int smu_handle_task (struct smu_context *smu,enum amd_dpm_forced_level level, -enum amd_pp_task task_id); +enum amd_pp_task task_id, +bool lock_needed); int smu_switch_power_profile(struct smu_context *smu,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-0enum PP_SMC_POWER_PROFILE type, bool en);@@ -843,7 +846,7 @@ int smu_get_dpm_freq_by_index(struct
smu_context*smu, enumsmu_clk_typeclk_typ
int smu_get_dpm_level_count(structsmu_context*smu, enumsmu_clk_typeclk_type,
uint32_t*value);
int smu_get_dpm_freq_range(structsmu_context*smu, enumsmu_clk_typeclk_type,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-1- uint32_t *min, uint32_t *max); + uint32_t *min, uint32_t *max, bool lock_needed); int smu_set_soft_freq_range(struct smu_context *smu, enum
smu_clk_typeclk_type,
uint32_tmin,uint32_tmax);
int smu_set_hard_freq_range(structsmu_context*smu, enumsmu_clk_typeclk_type,drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4
-1@@ -858,10 +861,20 @@ size_t smu_sys_get_pp_feature_mask(struct smu_context *smu, char *buf);int smu_sys_set_pp_feature_mask (struct smu_context *smu,uint64_t new_mask);int smu_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t mask); +uint32_t mask, +bool lock_needed);int smu_set_mp1_state (struct smu_context *smu,enum pp_mp1_state mp1_state);int smu_set_df_cstate (struct smu_context *smu,enum pp_df_cstate state); +int smu_get_max_sustainable_clocks_by_dc (struct smu_context *smu, + struct pp_smu_nv_clock_table
*max_clocks);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +6
-0+ +int smu_get_uclk_dpm_states (struct smu_context *smu, +unsigned int *clock_values_in_khz, +unsigned int *num_states); + +enum amd_pm_state_type smu_get_current_power_state(struct
smu_context*smu);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-0+#endif drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-2@@ -795,13 +795,13 @@ static int navi10_populate_umd_state_clk(struct smu_context *smu)int ret =0 ;uint32_t min_sclk_freq =0 , min_mclk_freq =0 ; - ret =smu_get_dpm_freq_range (smu,SMU_SCLK , &min_sclk_freq, NULL); + ret =smu_get_dpm_freq_range (smu,SMU_SCLK , &min_sclk_freq,NULL , false);if (ret)return ret; smu->pstate_sclk = min_sclk_freq *100 ; - ret = smu_get_dpm_freq_range(smu, SMU_MCLK,
&min_mclk_freq, NULL);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-0+ ret = smu_get_dpm_freq_range(smu, SMU_MCLK,
&min_mclk_freq, NULL, false);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-1if (ret)return ret;@@ -854,7 +854,7 @@ static int navi10_pre_display_config_changed(struct smu_context *smu)return ret;if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { - ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &max_freq); + ret = smu_get_dpm_freq_range(smu, SMU_UCLK, NULL,
&max_freq, false);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +0
-0if (ret)return ret; ret = smu_set_hard_freq_range(smu, SMU_UCLK, 0,
max_freq);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-1@@ -904,7 +904,7 @@ static int navi10_force_dpm_limit_value(struct smu_context *smu, bool highest)for (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1
-1if (ret)return ret;@@ -931,7 +931,7 @@ static int navi10_unforce_dpm_levels(struct smu_context *smu)for (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);drivers/gpu/drm/amd/powerplay/navi10_ppt.c +4
-1if (ret)return ret;@@ -1266,7 +1266,10 @@ static int navi10_notify_smc_dispaly_config(struct smu_context *smu) if (smu_feature_is_supported(smu,SMU_FEATURE_DPM_DCEFCLK_BIT )) { clock_req.clock_type = amd_pp_dcef_clock; clock_req.clock_freq_in_khz = min_clocks.dcef_clock *10 ; -if (!smu_display_clock_voltage_request (smu, &clock_req)) { + +if (smu->funcs->display_clock_voltage_request) + ret = smu->funcs- >display_clock_voltage_request(smu, &clock_req); +if (!ret) {if (smu_feature_is_supported(smu,
SMU_FEATURE_DS_DCEFCLK_BIT)) {
ret = smu_send_smc_msg_with_param(smu,
SMU_MSG_SetMinDeepSleepDcefclk,drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-1@@ -194,7 +194,7 @@ static int renoir_print_clk_levels(struct smu_context *smu, case SMU_SCLK:/* retirve table returned paramters unit is MHz */ cur_value = metrics.ClockFrequency[CLOCK_GFXCLK ]; - ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min, &max); + ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min, &max, false);drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0
-0if (!ret) {/* driver only know min/max gfx_clk, Add level 1 for all other gfx clks */
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0
-0if (cur_value == max)@@ -251,7 +251,6 @@ static enum amd_pm_state_typerenoir_get_current_power_state(struct
smu_contextdrivers/gpu/drm/amd/powerplay/renoir_ppt.c +0
-1!smu_dpm_ctx->dpm_current_power_state)return -EINVAL ; -mutex_lock (&(smu->mutex)); switch (smu_dpm_ctx->dpm_current_power_state-Quoted 1 line
classification.ui_label) {
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0
-0case SMU_STATE_UI_LABEL_BATTERY : pm_type =POWER_STATE_TYPE_BATTERY ;@@ -269,7 +268,6 @@ static enum amd_pm_state_typerenoir_get_current_power_state(struct
smu_contextdrivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-2pm_type =POWER_STATE_TYPE_DEFAULT ;break ; } -mutex_unlock (&(smu->mutex));return pm_type; }@@ -314,7 +312,7 @@ static int renoir_force_dpm_limit_value(struct smu_context *smu, bool highest)for (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-1if (ret)return ret;@@ -348,7 +346,7 @@ static int renoir_unforce_dpm_levels(struct smu_context *smu) { clk_type = clk_feature_map[i].clk_type; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false);drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-1if (ret)return ret;@@ -435,7 +433,7 @@ static int renoir_force_clk_levels(struct smu_context *smu, return -EINVAL ; } - ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min_freq, &max_freq); + ret =smu_get_dpm_freq_range (smu,SMU_GFXCLK , &min_freq, &max_freq, false);drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0
-0if (ret)return ret; ret = smu_send_smc_msg_with_param(smu,
SMU_MSG_SetSoftMaxGfxClk,drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-1@@ -511,7 +509,7 @@ static int renoir_set_peak_clock_by_device(struct smu_context *smu)int ret =0 ;uint32_t sclk_freq =0 , uclk_freq =0 ; - ret =smu_get_dpm_freq_range (smu,SMU_SCLK ,NULL , &sclk_freq); + ret =smu_get_dpm_freq_range (smu,SMU_SCLK ,NULL , &sclk_freq, false);drivers/gpu/drm/amd/powerplay/renoir_ppt.c +1
-1if (ret)return ret;@@ -519,7 +517,7 @@ static int renoir_set_peak_clock_by_device(struct smu_context *smu)if (ret)return ret; - ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &uclk_freq); + ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &uclk_freq, false);drivers/gpu/drm/amd/powerplay/renoir_ppt.c +0
-0if (ret)return ret;drivers/gpu/drm/amd/powerplay/smu_v11_0.c +5
-2@@ -809,8 +809,11 @@ static int smu_v11_0_set_min_dcef_deep_sleep(struct smu_context *smu) if (!table_context) return -EINVAL; - return smu_set_deep_sleep_dcefclk(smu, - table_context->boot_values.dcefclk / 100); +if (smu->funcs->set_deep_sleep_dcefclk) +return smu->funcs->set_deep_sleep_dcefclk (smu, + table_context->boot_values.dcefclk /100 ); + +return 0 ; }static int
smu_v11_0_set_tool_table_location(struct smu_context *smu)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-2@@ -1325,9 +1328,7 @@ smu_v11_0_display_clock_voltage_request(struct smu_context *smu, if (clk_select == SMU_UCLK && smu->disable_uclk_switch)return 0 ; -mutex_lock (&smu->mutex); ret =smu_set_hard_freq_range (smu, clk_select, clk_freq,0 ); -mutex_unlock (&smu->mutex);drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-2if (clk_select ==SMU_UCLK ) smu->hard_min_uclk_req_from_dal = clk_freq;@@ -1370,12 +1371,10 @@ static int smu_v11_0_gfx_off_control(struct smu_context *smu, bool enable)case CHIP_NAVI12 :if (!(adev->pm.pp_feature &PP_GFXOFF_MASK ))return 0 ; -mutex_lock (&smu->mutex);if (enable) ret =smu_send_smc_msg (smu, SMU_MSG_AllowGfxOff);else ret =smu_send_smc_msg (smu, SMU_MSG_DisallowGfxOff); -mutex_unlock (&smu->mutex);drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-2break ;default :break ;@@ -1491,10 +1490,9 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu, if (!speed) return -EINVAL; -mutex_lock (&(smu->mutex)); ret =smu_v11_0_auto_fan_control (smu,0 );if (ret) - goto set_fan_speed_rpm_failed; +return ret; crystal_clock_freq =amdgpu_asic_get_xclk (adev);drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-2tach_period =60 * crystal_clock_freq *10000 / (8 * speed);@@ -1505,8 +1503,6 @@ static int smu_v11_0_set_fan_speed_rpm(structsmu_context *smu, ret =smu_v11_0_set_fan_static_mode (smu,FDO_PWM_MODE_STATIC_RPM ); -set_fan_speed_rpm_failed: -mutex_unlock (&(smu->mutex));return ret;}
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-2@@ -1517,11 +1513,9 @@ static int smu_v11_0_set_xgmi_pstate(structsmu_context *smu, uint32_t pstate) { int ret = 0; -mutex_lock (&(smu->mutex)); ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetXgmiMode, pstate ?XGMI_STATE_D0 :XGMI_STATE_D3 ); -mutex_unlock (&(smu->mutex));return ret;}
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-2@@ -1633,9 +1627,7 @@ static int smu_v11_0_set_azalia_d3_pme(struct smu_context *smu) {int ret =0 ; -mutex_lock (&smu->mutex); ret =smu_send_smc_msg (smu, SMU_MSG_BacoAudioD3PME); -mutex_unlock (&smu->mutex);return ret;}
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-0@@ -1767,7 +1759,6 @@ static intsmu_v11_0_get_dpm_ultimate_freq(struct
smu_context*smu, enumsmu_clkdrivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-1int ret =0 , clk_id =0 ;uint32_t param =0 ; -mutex_lock (&smu->mutex); clk_id =smu_clk_get_index (smu, clk_type);if (clk_id <0 ) { ret = -EINVAL ;@@ -1794,7 +1785,6 @@ static intsmu_v11_0_get_dpm_ultimate_freq(struct
smu_context*smu, enumsmu_clkdrivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-1} failed: -mutex_unlock (&smu->mutex);return ret; }drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-0@@ -325,8 +325,6 @@ static int smu_v12_0_get_dpm_ultimate_freq(struct
smu_context*smu, enumsmu_clkdrivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-2int ret =0 ;uint32_t mclk_mask, soc_mask; -mutex_lock (&smu->mutex); -if (max) { ret = smu_get_profiling_clk_mask(smu,
AMD_DPM_FORCED_LEVEL_PROFILE_PEAK,drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-0NULL,@@ -396,7 +394,6 @@ static int smu_v12_0_get_dpm_ultimate_freq(struct
smu_context*smu, enumsmu_clkdrivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-1} } failed: -mutex_unlock (&smu->mutex);return ret; }drivers/gpu/drm/amd/powerplay/vega20_ppt.c +0
-1@@ -635,7 +635,6 @@ amd_pm_state_type vega20_get_current_power_state(struct smu_context *smu) !smu_dpm_ctx->dpm_current_power_state)return -EINVAL ; -mutex_lock (&(smu->mutex));switch (smu_dpm_ctx->dpm_current_power_state- >classification.ui_label) {drivers/gpu/drm/amd/powerplay/vega20_ppt.c +0
-1case SMU_STATE_UI_LABEL_BATTERY : pm_type =POWER_STATE_TYPE_BATTERY ;@@ -653,7 +652,6 @@ amd_pm_state_type vega20_get_current_power_state(struct smu_context *smu) pm_type =POWER_STATE_TYPE_DEFAULT ;break ; } -mutex_unlock (&(smu->mutex));return pm_type;}
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +0
-5@@ -1277,8 +1275,6 @@ static int vega20_force_clk_levels(structsmu_context *smu, uint32_t soft_min_level, soft_max_level, hard_min_level;int ret =0 ; -mutex_lock (&(smu->mutex)); - soft_min_level = mask ? (ffs (mask) -1 ) :0 ; soft_max_level = mask ? (fls (mask) -1 ) :0 ;@@ -1431,7 +1427,6 @@ static int vega20_force_clk_levels(structsmu_context *smu, break; } -mutex_unlock (&(smu->mutex));return ret; }@@ -1446,8 +1441,6 @@ static int vega20_get_clock_by_type_with_latency(struct smu_context *smu, dpm_table = smu_dpm->dpm_context; -mutex_lock (&smu->mutex); -switch (clk_type) {case SMU_GFXCLK :drivers/gpu/drm/amd/powerplay/vega20_ppt.c +4
-9single_dpm_table = &(dpm_table->gfx_table);@@ -1469,7 +1462,6 @@ static int vega20_get_clock_by_type_with_latency(struct smu_context *smu, ret = -EINVAL ; } -mutex_unlock (&smu->mutex);return ret; }@@ -2542,8 +2534,6 @@ static int vega20_set_od_percentage(structsmu_context *smu, int feature_enabled;PPCLK_e clk_id; -mutex_lock (&(smu->mutex)); - dpm_table = smu_dpm->dpm_context; golden_table = smu_dpm->golden_dpm_context;@@ -2593,11 +2583,10 @@ static int vega20_set_od_percentage(structsmu_context *smu, } ret =smu_handle_task (smu, smu_dpm->dpm_level, -AMD_PP_TASK_READJUST_POWER_STATE ); +AMD_PP_TASK_READJUST_POWER_STATE , + false); set_od_failed: -mutex_unlock (&(smu->mutex)); -return ret; }@@ -2822,10 +2811,9 @@ static int vega20_odn_edit_dpm_table(struct smu_context *smu, }if (type ==PP_OD_COMMIT_DPM_TABLE ) { -mutex_lock (&(smu->mutex)); ret =smu_handle_task (smu, smu_dpm->dpm_level, -AMD_PP_TASK_READJUST_POWER_STATE ); -mutex_unlock (&(smu->mutex)); +AMD_PP_TASK_READJUST_POWER_STATE , + false);drivers/gpu/drm/amd/powerplay/vega20_ppt.c +0
-1}return ret; --
Quoted 1 line
2.23.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx