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
Those swSMU APIs used internally are moved to smu_cmn.h while others are kept in amdgpu_smu.h.
--- 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_cmn.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_cmn.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_cmn.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_cmn.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_cmn.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_cmn.h" #include "soc15_common.h" #include "smu_v12_0_ppsmc.h" #include "smu12_driver_if.h"
drivers/gpu/drm/amd/powerplay/smu_cmn.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_cmn.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_cmn.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_cmn.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]
Re: [PATCH 2/3] drm/amd/powerplay: split out those internal used swSMU APIs
Quoted 4 lines · Evan
Those swSMU APIs used internally are moved to
smu_cmn.hwhile others are kept inamdgpu_smu.h.
Maybe call this smu_internal.h so it's clear these are internal SMU interfaces.
Alex
Quoted 550 lines
Change-Id Ib726ef7f65dee46e47a07680b71e6e043e459f42Signed-off-by Evan Quan <[email protected]>--- 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_cmn.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_cmn.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_cmn.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_cmn.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-163@@ -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) \ - ((smu)->funcs->get_vbios_bootup_values ? (smu)->funcs->get_vbios_bootup_values((smu)) : 0) -#define smu_get_clk_info_from_vbios (smu) \ - ((smu)->funcs->get_clk_info_from_vbios ? (smu)->funcs->get_clk_info_from_vbios((smu)) : 0) -#define smu_check_pptable (smu) \ - ((smu)->funcs->check_pptable ? (smu)->funcs->check_pptable((smu)) : 0) -#define smu_parse_pptable (smu) \ - ((smu)->funcs->parse_pptable ? (smu)->funcs->parse_pptable((smu)) : 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) \ - ((smu)->funcs->check_fw_version ? (smu)->funcs->check_fw_version((smu)) : 0) -#define smu_write_pptable (smu) \ - ((smu)->funcs->write_pptable ? (smu)->funcs->write_pptable((smu)) : 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) \ - ((smu)->funcs->set_tool_table_location ? (smu)->funcs->set_tool_table_location((smu)) : 0) -#define smu_notify_memory_pool_location (smu) \ - ((smu)->funcs->notify_memory_pool_location ? (smu)->funcs->notify_memory_pool_location((smu)) : 0) -#define smu_gfx_off_control (smu, enable) \ - ((smu)->funcs->gfx_off_control ? (smu)->funcs->gfx_off_control((smu), (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) \ - ((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) \ - ((smu)->funcs->system_features_control ? (smu)->funcs->system_features_control((smu), (en)) : 0) -#define smu_init_max_sustainable_clocks (smu) \ - ((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) -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->send_smc_msg((smu), (msg)) : 0) -#define smu_send_smc_msg_with_param (smu, msg, param) \ - ((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) \ - ((smu)->funcs->read_smc_arg? (smu)->funcs->read_smc_arg((smu), (arg)) : 0) -#define smu_alloc_dpm_context (smu) \ - ((smu)->ppt_funcs->alloc_dpm_context ? (smu)->ppt_funcs->alloc_dpm_context((smu)) : 0) -#define smu_init_display_count (smu, count) \ - ((smu)->funcs->init_display_count ? (smu)->funcs->init_display_count((smu), (count)) : 0) -#define smu_feature_set_allowed_mask (smu) \ - ((smu)->funcs->set_allowed_mask? (smu)->funcs->set_allowed_mask((smu)) : 0) -#define smu_feature_get_enabled_mask (smu, mask, num) \ - ((smu)->funcs->get_enabled_mask? (smu)->funcs->get_enabled_mask((smu), (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) \ - ((smu)->funcs->notify_display_change? (smu)->funcs->notify_display_change((smu)) : 0) -#define smu_store_powerplay_table (smu) \ - ((smu)->ppt_funcs->store_powerplay_table ? (smu)->ppt_funcs->store_powerplay_table((smu)) : 0) -#define smu_check_powerplay_table (smu) \ - ((smu)->ppt_funcs->check_powerplay_table ? (smu)->ppt_funcs->check_powerplay_table((smu)) : 0) -#define smu_append_powerplay_table (smu) \ - ((smu)->ppt_funcs->append_powerplay_table ? (smu)->ppt_funcs->append_powerplay_table((smu)) : 0) -#define smu_set_default_dpm_table (smu) \ - ((smu)->ppt_funcs->set_default_dpm_table ? (smu)->ppt_funcs->set_default_dpm_table((smu)) : 0) -#define smu_populate_umd_state_clk (smu) \ - ((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) +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); -#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)int smu_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf);int smu_get_od_percentage (struct smu_context *smu,enum smu_clk_type type);int smu_set_od_percentage (struct smu_context *smu,enum smu_clk_type type,uint32_t value);@@ -657,68 +576,24 @@ int smu_set_od_percentage(struct smu_context *smu, enum smu_clk_type type, uint3int 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->tables_init((smu), (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) \ - ((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)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)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)->ppt_funcs->pre_display_config_changed((smu)) : 0) -#define smu_display_config_changed (smu) \ - ((smu)->ppt_funcs->display_config_changed ? (smu)->ppt_funcs->display_config_changed((smu)) : 0) -#define smu_apply_clocks_adjust_rules (smu) \ - ((smu)->ppt_funcs->apply_clocks_adjust_rules ? (smu)->ppt_funcs->apply_clocks_adjust_rules((smu)) : 0) -#define smu_notify_smc_dispaly_config (smu) \ - ((smu)->ppt_funcs->notify_smc_dispaly_config ? (smu)->ppt_funcs->notify_smc_dispaly_config((smu)) : 0) -#define smu_force_dpm_limit_value (smu, highest) \ - ((smu)->ppt_funcs->force_dpm_limit_value ? (smu)->ppt_funcs->force_dpm_limit_value((smu), (highest)) : 0) -#define smu_unforce_dpm_levels (smu) \ - ((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) \ - ((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)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);int smu_set_fan_speed_percent (struct smu_context *smu,uint32_t speed);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) -#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) -#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) -#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) -#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) -#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) -#define smu_run_btc (smu) \ - ((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->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);int smu_set_active_display_count (struct smu_context *smu,uint32_t count); -#define smu_store_cc6_data (smu, st, cc6_dis, pst_dis, pst_sw_dis) \ - ((smu)->funcs->store_cc6_data ? (smu)->funcs->store_cc6_data((smu), (st), (cc6_dis), (pst_dis), (pst_sw_dis)) : 0) int smu_get_clock_by_type(struct smu_context *smu, enum 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 (struct smu_context *smu,struct pp_display_clock_request *clock_req);int smu_display_disable_memory_clock_switch (struct smu_context *smu,bool disable_memory_clock_switch); -#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) \ - ((smu)->funcs->get_perf_level ? (smu)->funcs->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->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,struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges); -#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) \ - ((smu)->ppt_funcs->dpm_set_vce_enable ? (smu)->ppt_funcs->dpm_set_vce_enable((smu), (enable)) : 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->set_watermarks_table((smu), (tab), (clock_ranges)) : 0) -#define smu_get_current_clk_freq_by_table (smu, clk_type, value) \ - ((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) \ - ((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) \ - ((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)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)bool smu_baco_is_support (struct smu_context *smu);@@ -777,21 +630,6 @@ int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state);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->set_performance_level((smu), (level)) : -EINVAL); -#define smu_dump_pptable (smu) \ - ((smu)->ppt_funcs->dump_pptable ? (smu)->ppt_funcs->dump_pptable((smu)) : 0) -#define smu_get_dpm_clk_limited (smu, clk_type, dpm_level, freq) \ - ((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) \ - ((smu)->ppt_funcs->update_pcie_parameters ? (smu)->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, uint16_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_cmn.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_cmn.h" #include "soc15_common.h" #include "smu_v12_0_ppsmc.h" #include "smu12_driver_if.h" drivers/gpu/drm/amd/powerplay/smu_cmn.h new file +206
-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 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 OR THE USE OR +* OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __SMU_CMN_H__ +#define __SMU_CMN_H__ + +#include "amdgpu_smu.h" + +#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) + +#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) + +#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) \ + ((smu)->funcs->get_clk_info_from_vbios ? (smu)->funcs->get_clk_info_from_vbios((smu)) : 0) +#define smu_check_pptable (smu) \ + ((smu)->funcs->check_pptable ? (smu)->funcs->check_pptable((smu)) : 0) +#define smu_parse_pptable (smu) \ + ((smu)->funcs->parse_pptable ? (smu)->funcs->parse_pptable((smu)) : 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) \ + ((smu)->funcs->check_fw_version ? (smu)->funcs->check_fw_version((smu)) : 0) +#define smu_write_pptable (smu) \ + ((smu)->funcs->write_pptable ? (smu)->funcs->write_pptable((smu)) : 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) \ + ((smu)->funcs->set_tool_table_location ? (smu)->funcs->set_tool_table_location((smu)) : 0) +#define smu_notify_memory_pool_location (smu) \ + ((smu)->funcs->notify_memory_pool_location ? (smu)->funcs->notify_memory_pool_location((smu)) : 0) +#define smu_gfx_off_control (smu, enable) \ + ((smu)->funcs->gfx_off_control ? (smu)->funcs->gfx_off_control((smu), (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) \ + ((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) \ + ((smu)->funcs->system_features_control ? (smu)->funcs->system_features_control((smu), (en)) : 0) +#define smu_init_max_sustainable_clocks (smu) \ + ((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_send_smc_msg (smu, msg) \ + ((smu)->funcs->send_smc_msg? (smu)->funcs->send_smc_msg((smu), (msg)) : 0) +#define smu_send_smc_msg_with_param (smu, msg, param) \ + ((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) \ + ((smu)->funcs->read_smc_arg? (smu)->funcs->read_smc_arg((smu), (arg)) : 0) +#define smu_alloc_dpm_context (smu) \ + ((smu)->ppt_funcs->alloc_dpm_context ? (smu)->ppt_funcs->alloc_dpm_context((smu)) : 0) +#define smu_init_display_count (smu, count) \ + ((smu)->funcs->init_display_count ? (smu)->funcs->init_display_count((smu), (count)) : 0) +#define smu_feature_set_allowed_mask (smu) \ + ((smu)->funcs->set_allowed_mask? (smu)->funcs->set_allowed_mask((smu)) : 0) +#define smu_feature_get_enabled_mask (smu, mask, num) \ + ((smu)->funcs->get_enabled_mask? (smu)->funcs->get_enabled_mask((smu), (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) \ + ((smu)->funcs->notify_display_change? (smu)->funcs->notify_display_change((smu)) : 0) +#define smu_store_powerplay_table (smu) \ + ((smu)->ppt_funcs->store_powerplay_table ? (smu)->ppt_funcs->store_powerplay_table((smu)) : 0) +#define smu_check_powerplay_table (smu) \ + ((smu)->ppt_funcs->check_powerplay_table ? (smu)->ppt_funcs->check_powerplay_table((smu)) : 0) +#define smu_append_powerplay_table (smu) \ + ((smu)->ppt_funcs->append_powerplay_table ? (smu)->ppt_funcs->append_powerplay_table((smu)) : 0) +#define smu_set_default_dpm_table (smu) \ + ((smu)->ppt_funcs->set_default_dpm_table ? (smu)->ppt_funcs->set_default_dpm_table((smu)) : 0) +#define smu_populate_umd_state_clk (smu) \ + ((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_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->tables_init((smu), (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) \ + ((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_smc_read_sensor (smu, sensor, data, size) \ + ((smu)->funcs->read_sensor? (smu)->funcs->read_sensor((smu), (sensor), (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) \ + ((smu)->ppt_funcs->display_config_changed ? (smu)->ppt_funcs->display_config_changed((smu)) : 0) +#define smu_apply_clocks_adjust_rules (smu) \ + ((smu)->ppt_funcs->apply_clocks_adjust_rules ? (smu)->ppt_funcs->apply_clocks_adjust_rules((smu)) : 0) +#define smu_notify_smc_dispaly_config (smu) \ + ((smu)->ppt_funcs->notify_smc_dispaly_config ? (smu)->ppt_funcs->notify_smc_dispaly_config((smu)) : 0) +#define smu_force_dpm_limit_value (smu, highest) \ + ((smu)->ppt_funcs->force_dpm_limit_value ? (smu)->ppt_funcs->force_dpm_limit_value((smu), (highest)) : 0) +#define smu_unforce_dpm_levels (smu) \ + ((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) \ + ((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_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) \ + ((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) \ + ((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) \ + ((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) \ + ((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) \ + ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_workload_type? (smu)->ppt_funcs->get_workload_type((smu), (profile)) : -EINVAL) : -EINVAL) +#define smu_run_btc (smu) \ + ((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->get_allowed_feature_mask? (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->store_cc6_data((smu), (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) \ + ((smu)->funcs->get_perf_level ? (smu)->funcs->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->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) \ + ((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) \ + ((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) \ + ((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) \ + ((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_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) \ + ((smu)->ppt_funcs->dump_pptable ? (smu)->ppt_funcs->dump_pptable((smu)) : 0) +#define smu_get_dpm_clk_limited (smu, clk_type, dpm_level, freq) \ + ((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) \ + ((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_cmn.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_cmn.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_cmn.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" --2.23.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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): CADnq5_Pnx=uDyFVHD=nNgFOP9iRw1SRh7R9=0og801+sQrE2Yw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
RE: [PATCH 2/3] drm/amd/powerplay: split out those internal used swSMU APIs
Thanks, that sounds better. Will send out the V2.
Regards,
Evan
-----Original Message-----
From: Alex Deucher <[email protected]>
Sent: Friday, October 18, 2019 11:54 PM
To: Quan, Evan <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>; Grodzovsky, Andrey <[email protected]>
Subject: Re: [PATCH 2/3] drm/amd/powerplay: split out those internal used swSMU APIs
Quoted 4 lines · Evan
Those swSMU APIs used internally are moved to
smu_cmn.hwhile others are kept inamdgpu_smu.h.
Maybe call this smu_internal.h so it's clear these are internal SMU interfaces.
Alex
Quoted 598 lines
Change-Id Ib726ef7f65dee46e47a07680b71e6e043e459f42Signed-off-by Evan Quan <[email protected]>--- 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_cmn.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 mode100644
drivers/gpu/drm/amd/powerplay/smu_cmn.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_cmn.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_cmn.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1
-79@@ -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); -#definesmu_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) \ - ((smu)->funcs->get_clk_info_from_vbios ? (smu)->funcs->get_clk_info_from_vbios((smu)) : 0) -#define smu_check_pptable (smu) \ - ((smu)->funcs->check_pptable ? (smu)->funcs->check_pptable((smu)) : 0) -#define smu_parse_pptable (smu) \ - ((smu)->funcs->parse_pptable ? (smu)->funcs->parse_pptable((smu)) : 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) \ - ((smu)->funcs->check_fw_version ? (smu)->funcs->check_fw_version((smu)) : 0) -#define smu_write_pptable (smu) \ - ((smu)->funcs->write_pptable ? (smu)->funcs->write_pptable((smu)) : 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) \ - ((smu)->funcs->set_tool_table_location ? (smu)->funcs->set_tool_table_location((smu)) : 0) -#define smu_notify_memory_pool_location (smu) \ - ((smu)->funcs->notify_memory_pool_location ? (smu)->funcs->notify_memory_pool_location((smu)) : 0) -#define smu_gfx_off_control (smu, enable) \ - ((smu)->funcs->gfx_off_control ? (smu)->funcs->gfx_off_control((smu), (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) \ - ((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) \ - ((smu)->funcs->system_features_control ? (smu)->funcs->system_features_control((smu), (en)) : 0) -#define smu_init_max_sustainable_clocks (smu) \ - ((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) -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->send_smc_msg((smu), (msg)) : 0) -#define smu_send_smc_msg_with_param (smu, msg, param) \ - ((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) \ - ((smu)->funcs->read_smc_arg? (smu)->funcs->read_smc_arg((smu), (arg)) : 0) -#define smu_alloc_dpm_context (smu) \ - ((smu)->ppt_funcs->alloc_dpm_context ? (smu)->ppt_funcs->alloc_dpm_context((smu)) : 0) -#define smu_init_display_count (smu, count) \ - ((smu)->funcs->init_display_count ? (smu)->funcs->init_display_count((smu), (count)) : 0) -#define smu_feature_set_allowed_mask (smu) \ - ((smu)->funcs->set_allowed_mask? (smu)->funcs->set_allowed_mask((smu)) : 0) -#define smu_feature_get_enabled_mask (smu, mask, num) \ - ((smu)->funcs->get_enabled_mask? (smu)->funcs->get_enabled_mask((smu), (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) \ - ((smu)->funcs->notify_display_change? (smu)->funcs->notify_display_change((smu)) : 0) -#define smu_store_powerplay_table (smu) \ - ((smu)->ppt_funcs->store_powerplay_table ? (smu)->ppt_funcs->store_powerplay_table((smu)) : 0) -#define smu_check_powerplay_table (smu) \ - ((smu)->ppt_funcs->check_powerplay_table ? (smu)->ppt_funcs->check_powerplay_table((smu)) : 0) -#define smu_append_powerplay_table (smu) \ - ((smu)->ppt_funcs->append_powerplay_table ? (smu)->ppt_funcs->append_powerplay_table((smu)) : 0) -#define smu_set_default_dpm_table (smu) \ - ((smu)->ppt_funcs->set_default_dpm_table ? (smu)->ppt_funcs->set_default_dpm_table((smu)) : 0) -#define smu_populate_umd_state_clk (smu) \ - ((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) +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 @@ intsmu_get_power_limit(struct
smu_context*smu,bool lock_needed);int
smu_set_power_limit(struct smu_context *smu, uint32_t limit);drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-2-#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) int smu_print_clk_levels(struct smu_context *smu, enum smu_clk_type
clk_type, char *buf); int smu_get_od_percentage(structsmu_context
*smu, enumsmu_clk_typetype); int smu_set_od_percentage(structsmu_context*smu, enumsmu_clk_typetype,uint32_tvalue); @@ -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,
enumPP_OD_DPM_TABLE_COMMANDtype,
long *input,uint32_tsize); -#definesmu_tables_init(smu, tab)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-7- ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs->tables_init((smu), (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) \ - ((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)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)
intsmu_get_power_profile_mode(struct smu_context *smu, char *buf);int smu_set_power_profile_mode(struct
smu_context*smu,
long *param,uint32_tparam_size, boollock_needed); -#definesmu_pre_display_config_changed(smu)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-15- ((smu)->ppt_funcs->pre_display_config_changed ? (smu)->ppt_funcs->pre_display_config_changed((smu)) : 0) -#define smu_display_config_changed (smu) \ - ((smu)->ppt_funcs->display_config_changed ? (smu)->ppt_funcs->display_config_changed((smu)) : 0) -#define smu_apply_clocks_adjust_rules (smu) \ - ((smu)->ppt_funcs->apply_clocks_adjust_rules ? (smu)->ppt_funcs->apply_clocks_adjust_rules((smu)) : 0) -#define smu_notify_smc_dispaly_config (smu) \ - ((smu)->ppt_funcs->notify_smc_dispaly_config ? (smu)->ppt_funcs->notify_smc_dispaly_config((smu)) : 0) -#define smu_force_dpm_limit_value (smu, highest) \ - ((smu)->ppt_funcs->force_dpm_limit_value ? (smu)->ppt_funcs->force_dpm_limit_value((smu), (highest)) : 0) -#define smu_unforce_dpm_levels (smu) \ - ((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) \ - ((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)int smu_get_fan_control_mode (struct smu_context *smu);int
smu_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
-16-#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) \ - ((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) \ - ((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) \ - ((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) \ - ((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) \ - ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_workload_type? (smu)->ppt_funcs->get_workload_type((smu), (profile)) : -EINVAL) : -EINVAL) -#define smu_run_btc (smu) \ - ((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->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);int
smu_set_active_display_count(struct smu_context *smu, uint32_t count); -#definesmu_store_cc6_data(smu, st, cc6_dis, pst_dis, pst_sw_dis)\
- ((smu)->funcs->store_cc6_data ? (smu)->funcs->store_cc6_data((smu), (st), (cc6_dis), (pst_dis), (pst_sw_dis)) : 0)int smu_get_clock_by_type(struct
smu_context*smu,enum 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); int smu_display_disable_memory_clock_switch(structsmu_context*smu, booldisable_memory_clock_switch); -#definesmu_get_dal_power_level(smu, clocks)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-5- ((smu)->funcs->get_dal_power_level ? (smu)->funcs->get_dal_power_level((smu), (clocks)) : 0) -#define smu_get_perf_level (smu, designation, level) \ - ((smu)->funcs->get_perf_level ? (smu)->funcs->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->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, struct
dm_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
-3- ((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) \ - ((smu)->ppt_funcs->dpm_set_vce_enable ? (smu)->ppt_funcs->dpm_set_vce_enable((smu), (enable)) : 0)int smu_set_xgmi_pstate (struct smu_context *smu, uint32_t pstate); -#define
smu_set_watermarks_table(smu, tab, clock_ranges)\drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-9- ((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) \ - ((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) \ - ((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) \ - ((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) int smu_set_azalia_d3_pme(struct smu_context *smu); -#define
smu_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->get_dpm_ultimate_freq((smu), (param), (min), (max)) : 0)bool smu_baco_is_support (struct smu_context *smu);@@ -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
-14- ((smu)->ppt_funcs->set_performance_level? (smu)->ppt_funcs->set_performance_level ((smu), (level)) : -EINVAL ); -#define smu_dump_pptable (smu) \ - ((smu)->ppt_funcs->dump_pptable ? (smu)->ppt_funcs->dump_pptable((smu)) : 0) -#define smu_get_dpm_clk_limited (smu, clk_type, dpm_level, freq) \ - ((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) \ - ((smu)->ppt_funcs->update_pcie_parameters ? (smu)->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, uint16_t *size, uint8_t *frev,
uint8_t*crev, diff --gita/drivers/gpu/drm/amd/powerplay/navi10_ppt.cb/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
indexead40b2840f9..efcea05bf027100644drivers/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_cmn.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_cmn.h" #include "soc15_common.h" #include "smu_v12_0_ppsmc.h" #include "smu12_driver_if.h" drivers/gpu/drm/amd/powerplay/smu_cmn.h new file +244
-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 +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 OR THE USE +OR +* OTHER DEALINGS IN THE SOFTWARE. +*/ + +#ifndef __SMU_CMN_H__ +#define __SMU_CMN_H__ + +#include "amdgpu_smu.h" + +#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) + +#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) + +#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) \ + ((smu)->funcs->get_clk_info_from_vbios ? +(smu)->funcs->get_clk_info_from_vbios((smu)) : 0) #define smu_check_pptable(smu) \ + ((smu)->funcs->check_pptable ? +(smu)->funcs->check_pptable((smu)) : 0) #define smu_parse_pptable(smu) \ + ((smu)->funcs->parse_pptable ? +(smu)->funcs->parse_pptable((smu)) : 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) \ + ((smu)->funcs->check_fw_version ? +(smu)->funcs->check_fw_version((smu)) : 0) #define smu_write_pptable(smu) \ + ((smu)->funcs->write_pptable ? +(smu)->funcs->write_pptable((smu)) : 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) \ + ((smu)->funcs->set_tool_table_location ? +(smu)->funcs->set_tool_table_location((smu)) : 0) #define smu_notify_memory_pool_location(smu) \ + ((smu)->funcs->notify_memory_pool_location ? +(smu)->funcs->notify_memory_pool_location((smu)) : 0) #define smu_gfx_off_control(smu, enable) \ + ((smu)->funcs->gfx_off_control ? +(smu)->funcs->gfx_off_control((smu), (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) \ + ((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) \ + ((smu)->funcs->system_features_control ? +(smu)->funcs->system_features_control((smu), (en)) : 0) #define smu_init_max_sustainable_clocks(smu) \ + ((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_send_smc_msg(smu, msg) \ + ((smu)->funcs->send_smc_msg? (smu)->funcs->send_smc_msg((smu), +(msg)) : 0) #define smu_send_smc_msg_with_param(smu, msg, param) \ + ((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) \ + ((smu)->funcs->read_smc_arg? (smu)->funcs->read_smc_arg((smu), +(arg)) : 0) #define smu_alloc_dpm_context(smu) \ + ((smu)->ppt_funcs->alloc_dpm_context ? +(smu)->ppt_funcs->alloc_dpm_context((smu)) : 0) #define smu_init_display_count(smu, count) \ + ((smu)->funcs->init_display_count ? +(smu)->funcs->init_display_count((smu), (count)) : 0) #define smu_feature_set_allowed_mask(smu) \ + ((smu)->funcs->set_allowed_mask? +(smu)->funcs->set_allowed_mask((smu)) : 0) #define smu_feature_get_enabled_mask(smu, mask, num) \ + ((smu)->funcs->get_enabled_mask? +(smu)->funcs->get_enabled_mask((smu), (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) \ + ((smu)->funcs->notify_display_change? +(smu)->funcs->notify_display_change((smu)) : 0) #define smu_store_powerplay_table(smu) \ + ((smu)->ppt_funcs->store_powerplay_table ? +(smu)->ppt_funcs->store_powerplay_table((smu)) : 0) #define smu_check_powerplay_table(smu) \ + ((smu)->ppt_funcs->check_powerplay_table ? +(smu)->ppt_funcs->check_powerplay_table((smu)) : 0) #define smu_append_powerplay_table(smu) \ + ((smu)->ppt_funcs->append_powerplay_table ? +(smu)->ppt_funcs->append_powerplay_table((smu)) : 0) #define smu_set_default_dpm_table(smu) \ + ((smu)->ppt_funcs->set_default_dpm_table ? +(smu)->ppt_funcs->set_default_dpm_table((smu)) : 0) #define smu_populate_umd_state_clk(smu) \ + ((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_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->tables_init((smu), (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) \ + ((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_smc_read_sensor(smu, sensor, data, size) \ + ((smu)->funcs->read_sensor? (smu)->funcs->read_sensor((smu), +(sensor), (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) \ + ((smu)->ppt_funcs->display_config_changed ? +(smu)->ppt_funcs->display_config_changed((smu)) : 0) #define smu_apply_clocks_adjust_rules(smu) \ + ((smu)->ppt_funcs->apply_clocks_adjust_rules ? +(smu)->ppt_funcs->apply_clocks_adjust_rules((smu)) : 0) #define smu_notify_smc_dispaly_config(smu) \ + ((smu)->ppt_funcs->notify_smc_dispaly_config ? +(smu)->ppt_funcs->notify_smc_dispaly_config((smu)) : 0) #define smu_force_dpm_limit_value(smu, highest) \ + ((smu)->ppt_funcs->force_dpm_limit_value ? +(smu)->ppt_funcs->force_dpm_limit_value((smu), (highest)) : 0) #define smu_unforce_dpm_levels(smu) \ + ((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) \ + ((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_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) \ + ((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) \ + ((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) \ + ((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) \ + ((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) \ + ((smu)->ppt_funcs? ((smu)->ppt_funcs->get_workload_type? +(smu)->ppt_funcs->get_workload_type((smu), (profile)) : -EINVAL) : -EINVAL) #define smu_run_btc(smu) \ + ((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->get_allowed_feature_mask? +(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->store_cc6_data((smu), (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) \ + ((smu)->funcs->get_perf_level ? +(smu)->funcs->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->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) \ + ((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) \ + ((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) \ + ((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) \ + ((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_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) \ + ((smu)->ppt_funcs->dump_pptable ? +(smu)->ppt_funcs->dump_pptable((smu)) : 0) #define smu_get_dpm_clk_limited(smu, clk_type, dpm_level, freq) \ + ((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) \ + ((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_cmn.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_cmn.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_cmn.h" #include "atomfirmware.h" #include "amdgpu_atomfirmware.h" #include "smu_v11_0.h" --2.23.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
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_cmn.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_cmn.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
A message that is not in the archive (sent off-list or not yet received): [email protected]
Alex Deucher
Acked-byRe: [PATCH 3/3] drm/amd/powerplay: clear the swSMU code layer
Nice cleanup. As a next step, it would be nice to converge on a single set of ppt functions so we could clean up all the call sites to have one path regardless of powerplay or swSMU as the backend implementation.
Quoted 1,987 lines · Evan
With this cleanup, the APIs from
amdgpu_smu.cwill map to ASIC specific ones directly. Those can be shared around all SMU V11/V12 ASICs will be put insmu_v11_0.candsmu_v12_0.crespectively.Change-Id I9b98eb5ace5df19896de4b05c37255a38d1079ceSigned-off-by Evan Quan <[email protected]>--- 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_cmn.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@@ -346,7 +346,7 @@ bool dm_pp_get_clock_levels_by_type(/* Error in pplib. Provide default values. */ return true; } - }else if (adev->smu.funcs && adev->smu.funcs->get_clock_by_type) { + }else if (adev->smu.ppt_funcs && adev->smu.ppt_funcs->get_clock_by_type) {if (smu_get_clock_by_type (&adev->smu,dc_to_pp_clock_type (clk_type), &pp_clks)) {@@ -366,7 +366,7 @@ bool dm_pp_get_clock_levels_by_type( validation_clks.memory_max_clock =80000 ; validation_clks.level =0 ; } - }else if (adev->smu.funcs && adev->smu.funcs->get_max_high_clocks) { + }else if (adev->smu.ppt_funcs && adev->smu.ppt_funcs->get_max_high_clocks) {if (smu_get_max_high_clocks (&adev->smu, &validation_clks)) {DRM_INFO ("DM_PPLIB: Warning: using default validation clocks!\n" ); validation_clks.engine_max_clock =72000 ;@@ -507,8 +507,8 @@ bool dm_pp_apply_clock_for_voltage_request( ret = adev->powerplay.pp_funcs->display_clock_voltage_request ( adev->powerplay.pp_handle, &pp_clock_request); - else if (adev->smu.funcs && - adev->smu.funcs->display_clock_voltage_request) + else if (adev->smu.ppt_funcs && + adev->smu.ppt_funcs->display_clock_voltage_request) ret =smu_display_clock_voltage_request (&adev->smu, &pp_clock_request);if (ret)@@ -528,7 +528,7 @@ bool dm_pp_get_static_clocks( ret = adev->powerplay.pp_funcs->get_current_clocks ( adev->powerplay.pp_handle, &pp_clk_info); - else if (adev->smu.funcs) + else if (adev->smu.ppt_funcs) ret =smu_get_current_clocks (&adev->smu, &pp_clk_info);if (ret)return false;@@ -590,8 +590,8 @@ void pp_rv_set_wm_ranges(struct pp_smu *pp,if (pp_funcs && pp_funcs->set_watermarks_for_clocks_ranges) pp_funcs->set_watermarks_for_clocks_ranges (pp_handle, &wm_with_clock_ranges); -else if (adev->smu.funcs && - adev->smu.funcs->set_watermarks_for_clock_ranges) +else if (adev->smu.ppt_funcs && + adev->smu.ppt_funcs->set_watermarks_for_clock_ranges)smu_set_watermarks_for_clock_ranges (&adev->smu, &wm_with_clock_ranges); }@@ -605,7 +605,7 @@ void pp_rv_set_pme_wa_enable(struct pp_smu *pp)if (pp_funcs && pp_funcs->notify_smu_enable_pwe) pp_funcs->notify_smu_enable_pwe (pp_handle); -else if (adev->smu.funcs) +else if (adev->smu.ppt_funcs)smu_notify_smu_enable_pwe (&adev->smu); }@@ -709,10 +709,10 @@ enum pp_smu_status pp_nv_set_wm_ranges(struct pp_smu *pp, ranges->writer_wm_sets[i].min_drain_clk_mhz *1000 ; } -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; -/* 0: successful or smu.funcs->set_watermarks_for_clock_ranges = NULL; +/* 0: successful or smu.ppt_funcs->set_watermarks_for_clock_ranges = NULL; * 1: fail */ if (smu_set_watermarks_for_clock_ranges(&adev->smu,@@ -728,10 +728,10 @@ enum pp_smu_status pp_nv_set_pme_wa_enable(struct pp_smu *pp)struct amdgpu_device *adev = ctx->driver_context;struct smu_context *smu = &adev->smu; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; -/* 0: successful or smu.funcs->set_azalia_d3_pme = NULL; 1: fail */ +/* 0: successful or smu.ppt_funcs->set_azalia_d3_pme = NULL; 1: fail */ if (smu_set_azalia_d3_pme (smu))return PP_SMU_RESULT_FAIL ;@@ -744,10 +744,10 @@ enum pp_smu_status pp_nv_set_display_count(struct pp_smu *pp, int count)struct amdgpu_device *adev = ctx->driver_context;struct smu_context *smu = &adev->smu; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; -/* 0: successful or smu.funcs->set_display_count = NULL; 1: fail */ +/* 0: successful or smu.ppt_funcs->set_display_count = NULL; 1: fail */ if (smu_set_display_count (smu, count))return PP_SMU_RESULT_FAIL ;@@ -760,10 +760,10 @@ enum pp_smu_status pp_nv_set_min_deep_sleep_dcfclk(struct pp_smu *pp, int mhz)struct amdgpu_device *adev = ctx->driver_context;struct smu_context *smu = &adev->smu; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; -/* 0: successful or smu.funcs->set_deep_sleep_dcefclk = NULL;1: fail */ +/* 0: successful or smu.ppt_funcs->set_deep_sleep_dcefclk = NULL;1: fail */ if (smu_set_deep_sleep_dcefclk (smu, mhz))return PP_SMU_RESULT_FAIL ;@@ -778,13 +778,13 @@ enum pp_smu_status pp_nv_set_hard_min_dcefclk_by_freq(struct smu_context *smu = &adev->smu;struct pp_display_clock_request clock_req; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; clock_req.clock_type = amd_pp_dcef_clock; clock_req.clock_freq_in_khz = mhz *1000 ; -/* 0: successful or smu.funcs->display_clock_voltage_request = NULL +/* 0: successful or smu.ppt_funcs->display_clock_voltage_request = NULL * 1: fail */ if (smu_display_clock_voltage_request (smu, &clock_req))@@ -800,13 +800,13 @@ enum pp_smu_status pp_nv_set_hard_min_uclk_by_freq(struct pp_smu *pp, int mhz)struct smu_context *smu = &adev->smu;struct pp_display_clock_request clock_req; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; clock_req.clock_type = amd_pp_mem_clock; clock_req.clock_freq_in_khz = mhz *1000 ; -/* 0: successful or smu.funcs->display_clock_voltage_request = NULL +/* 0: successful or smu.ppt_funcs->display_clock_voltage_request = NULL * 1: fail */ if (smu_display_clock_voltage_request (smu, &clock_req))@@ -836,7 +836,7 @@ enum pp_smu_status pp_nv_set_voltage_by_freq(struct pp_smu *pp,struct smu_context *smu = &adev->smu;struct pp_display_clock_request clock_req; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ;switch (clock_id) {@@ -854,7 +854,7 @@ enum pp_smu_status pp_nv_set_voltage_by_freq(struct pp_smu *pp, } clock_req.clock_freq_in_khz = mhz *1000 ; -/* 0: successful or smu.funcs->display_clock_voltage_request = NULL +/* 0: successful or smu.ppt_funcs->display_clock_voltage_request = NULL * 1: fail */ if (smu_display_clock_voltage_request (smu, &clock_req))@@ -870,10 +870,10 @@ enum pp_smu_status pp_nv_get_maximum_sustainable_clocks(struct amdgpu_device *adev = ctx->driver_context;struct smu_context *smu = &adev->smu; -if (!smu->funcs) +if (!smu->ppt_funcs)return PP_SMU_RESULT_UNSUPPORTED ; -if (!smu->funcs->get_max_sustainable_clocks_by_dc) +if (!smu->ppt_funcs->get_max_sustainable_clocks_by_dc)return PP_SMU_RESULT_UNSUPPORTED ;if (!smu_get_max_sustainable_clocks_by_dc (smu, max_clocks))drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +63
-56@@ -31,6 +31,10 @@#include "smu_v12_0.h" #include "atom.h" #include "amd_pcie.h" +#include "vega20_ppt.h" +#include "arcturus_ppt.h" +#include "navi10_ppt.h" +#include "renoir_ppt.h" #undef __SMU_DUMMY_MAP#define __SMU_DUMMY_MAP (type) #type@@ -703,23 +707,26 @@ static int smu_set_funcs(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_VEGA20 : +vega20_set_ppt_funcs (smu); +break ;case CHIP_NAVI10 :case CHIP_NAVI14 :case CHIP_NAVI12 : +navi10_set_ppt_funcs (smu); +break ;case CHIP_ARCTURUS : -if (adev->pm.pp_feature &PP_OVERDRIVE_MASK ) - smu->od_enabled = true; -smu_v11_0_set_smu_funcs (smu); +arcturus_set_ppt_funcs (smu);break ;case CHIP_RENOIR : -if (adev->pm.pp_feature &PP_OVERDRIVE_MASK ) - smu->od_enabled = true; -smu_v12_0_set_smu_funcs (smu); +renoir_set_ppt_funcs (smu);break ;default :return -EINVAL ; } +if (adev->pm.pp_feature &PP_OVERDRIVE_MASK ) + smu->od_enabled = true; +return 0 ; }@@ -1177,16 +1184,16 @@ 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 ) { -if (smu->funcs->load_microcode) { - ret = smu->funcs->load_microcode (smu); +if (smu->ppt_funcs->load_microcode) { + ret = smu->ppt_funcs->load_microcode (smu);if (ret)return ret; } } } -if (smu->funcs->check_fw_status) { - ret = smu->funcs->check_fw_status (smu); +if (smu->ppt_funcs->check_fw_status) { + ret = smu->ppt_funcs->check_fw_status (smu);if (ret)pr_err ("SMC is not ready\n" ); }@@ -1391,8 +1398,8 @@ int smu_display_configuration_change(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->funcs->set_deep_sleep_dcefclk) - smu->funcs->set_deep_sleep_dcefclk (smu, +if (smu->ppt_funcs->set_deep_sleep_dcefclk) + smu->ppt_funcs->set_deep_sleep_dcefclk (smu, display_config->min_dcef_deep_sleep_set_clk /100 );for (index =0 ; index < display_config->num_path_including_non_display; index++) {@@ -1907,8 +1914,8 @@ int smu_load_microcode(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->load_microcode) - ret = smu->funcs->load_microcode (smu); +if (smu->ppt_funcs->load_microcode) + ret = smu->ppt_funcs->load_microcode (smu);mutex_unlock (&smu->mutex);@@ -1921,8 +1928,8 @@ int smu_check_fw_status(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->check_fw_status) - ret = smu->funcs->check_fw_status (smu); +if (smu->ppt_funcs->check_fw_status) + ret = smu->ppt_funcs->check_fw_status (smu);mutex_unlock (&smu->mutex);@@ -1935,8 +1942,8 @@ int smu_set_gfx_cgpg(struct smu_context *smu, bool enabled)mutex_lock (&smu->mutex); -if (smu->funcs->set_gfx_cgpg) - ret = smu->funcs->set_gfx_cgpg (smu, enabled); +if (smu->ppt_funcs->set_gfx_cgpg) + ret = smu->ppt_funcs->set_gfx_cgpg (smu, enabled);mutex_unlock (&smu->mutex);@@ -1949,8 +1956,8 @@ int smu_set_fan_speed_rpm(struct smu_context *smu, uint32_t speed)mutex_lock (&smu->mutex); -if (smu->funcs->set_fan_speed_rpm) - ret = smu->funcs->set_fan_speed_rpm (smu, speed); +if (smu->ppt_funcs->set_fan_speed_rpm) + ret = smu->ppt_funcs->set_fan_speed_rpm (smu, speed);mutex_unlock (&smu->mutex);@@ -1982,8 +1989,8 @@ int smu_set_power_limit(struct smu_context *smu, uint32_t limit)mutex_lock (&smu->mutex); -if (smu->funcs->set_power_limit) - ret = smu->funcs->set_power_limit (smu, limit); +if (smu->ppt_funcs->set_power_limit) + ret = smu->ppt_funcs->set_power_limit (smu, limit);mutex_unlock (&smu->mutex);@@ -2104,8 +2111,8 @@ int smu_get_fan_control_mode(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->get_fan_control_mode) - ret = smu->funcs->get_fan_control_mode (smu); +if (smu->ppt_funcs->get_fan_control_mode) + ret = smu->ppt_funcs->get_fan_control_mode (smu);mutex_unlock (&smu->mutex);@@ -2118,8 +2125,8 @@ int smu_set_fan_control_mode(struct smu_context *smu, int value)mutex_lock (&smu->mutex); -if (smu->funcs->set_fan_control_mode) - ret = smu->funcs->set_fan_control_mode (smu, value); +if (smu->ppt_funcs->set_fan_control_mode) + ret = smu->ppt_funcs->set_fan_control_mode (smu, value);mutex_unlock (&smu->mutex);@@ -2146,8 +2153,8 @@ int smu_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)mutex_lock (&smu->mutex); -if (smu->funcs->set_fan_speed_percent) - ret = smu->funcs->set_fan_speed_percent (smu, speed); +if (smu->ppt_funcs->set_fan_speed_percent) + ret = smu->ppt_funcs->set_fan_speed_percent (smu, speed);mutex_unlock (&smu->mutex);@@ -2174,8 +2181,8 @@ int smu_set_deep_sleep_dcefclk(struct smu_context *smu, int clk)mutex_lock (&smu->mutex); -if (smu->funcs->set_deep_sleep_dcefclk) - ret = smu->funcs->set_deep_sleep_dcefclk (smu, clk); +if (smu->ppt_funcs->set_deep_sleep_dcefclk) + ret = smu->ppt_funcs->set_deep_sleep_dcefclk (smu, clk);mutex_unlock (&smu->mutex);@@ -2188,8 +2195,8 @@ int smu_set_active_display_count(struct smu_context *smu, uint32_t count)mutex_lock (&smu->mutex); -if (smu->funcs->set_active_display_count) - ret = smu->funcs->set_active_display_count (smu, count); +if (smu->ppt_funcs->set_active_display_count) + ret = smu->ppt_funcs->set_active_display_count (smu, count);mutex_unlock (&smu->mutex);@@ -2204,8 +2211,8 @@ int smu_get_clock_by_type(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->funcs->get_clock_by_type) - ret = smu->funcs->get_clock_by_type (smu, type, clocks); +if (smu->ppt_funcs->get_clock_by_type) + ret = smu->ppt_funcs->get_clock_by_type (smu, type, clocks);mutex_unlock (&smu->mutex);@@ -2219,8 +2226,8 @@ int smu_get_max_high_clocks(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->funcs->get_max_high_clocks) - ret = smu->funcs->get_max_high_clocks (smu, clocks); +if (smu->ppt_funcs->get_max_high_clocks) + ret = smu->ppt_funcs->get_max_high_clocks (smu, clocks);mutex_unlock (&smu->mutex);@@ -2267,8 +2274,8 @@ int smu_display_clock_voltage_request(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->funcs->display_clock_voltage_request) - ret = smu->funcs->display_clock_voltage_request (smu, clock_req); +if (smu->ppt_funcs->display_clock_voltage_request) + ret = smu->ppt_funcs->display_clock_voltage_request (smu, clock_req);mutex_unlock (&smu->mutex);@@ -2296,8 +2303,8 @@ int smu_notify_smu_enable_pwe(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->notify_smu_enable_pwe) - ret = smu->funcs->notify_smu_enable_pwe (smu); +if (smu->ppt_funcs->notify_smu_enable_pwe) + ret = smu->ppt_funcs->notify_smu_enable_pwe (smu);mutex_unlock (&smu->mutex);@@ -2311,8 +2318,8 @@ int smu_set_watermarks_for_clock_ranges(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->funcs->set_watermarks_for_clock_ranges) - ret = smu->funcs->set_watermarks_for_clock_ranges (smu, clock_ranges); +if (smu->ppt_funcs->set_watermarks_for_clock_ranges) + ret = smu->ppt_funcs->set_watermarks_for_clock_ranges (smu, clock_ranges);mutex_unlock (&smu->mutex);@@ -2326,8 +2333,8 @@ int smu_set_xgmi_pstate(struct smu_context *smu,mutex_lock (&smu->mutex); -if (smu->funcs->set_xgmi_pstate) - ret = smu->funcs->set_xgmi_pstate (smu, pstate); +if (smu->ppt_funcs->set_xgmi_pstate) + ret = smu->ppt_funcs->set_xgmi_pstate (smu, pstate);mutex_unlock (&smu->mutex);@@ -2340,8 +2347,8 @@ int smu_set_azalia_d3_pme(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->set_azalia_d3_pme) - ret = smu->funcs->set_azalia_d3_pme (smu); +if (smu->ppt_funcs->set_azalia_d3_pme) + ret = smu->ppt_funcs->set_azalia_d3_pme (smu);mutex_unlock (&smu->mutex);@@ -2354,8 +2361,8 @@ bool smu_baco_is_support(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->baco_is_support) - ret = smu->funcs->baco_is_support (smu); +if (smu->ppt_funcs->baco_is_support) + ret = smu->ppt_funcs->baco_is_support (smu);mutex_unlock (&smu->mutex);@@ -2364,11 +2371,11 @@ bool smu_baco_is_support(struct smu_context *smu)int smu_baco_get_state (struct smu_context *smu,enum smu_baco_state *state) { -if (smu->funcs->baco_get_state) +if (smu->ppt_funcs->baco_get_state)return -EINVAL ;mutex_lock (&smu->mutex); - *state = smu->funcs->baco_get_state (smu); + *state = smu->ppt_funcs->baco_get_state (smu);mutex_unlock (&smu->mutex);return 0 ;@@ -2380,8 +2387,8 @@ int smu_baco_reset(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->baco_reset) - ret = smu->funcs->baco_reset (smu); +if (smu->ppt_funcs->baco_reset) + ret = smu->ppt_funcs->baco_reset (smu);mutex_unlock (&smu->mutex);@@ -2394,8 +2401,8 @@ int smu_mode2_reset(struct smu_context *smu)mutex_lock (&smu->mutex); -if (smu->funcs->mode2_reset) - ret = smu->funcs->mode2_reset (smu); +if (smu->ppt_funcs->mode2_reset) + ret = smu->ppt_funcs->mode2_reset (smu);mutex_unlock (&smu->mutex);@@ -2409,8 +2416,8 @@ int smu_get_max_sustainable_clocks_by_dc(struct smu_context *smu,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); +if (smu->ppt_funcs->get_max_sustainable_clocks_by_dc) + ret = smu->ppt_funcs->get_max_sustainable_clocks_by_dc (smu, max_clocks);mutex_unlock (&smu->mutex);drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +52
-1@@ -1057,7 +1057,7 @@ static int arcturus_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_smc_read_sensor (smu, sensor, data, size); + ret =smu_v11_0_read_sensor (smu, sensor, data, size); }mutex_unlock (&smu->sensor_lock);@@ -1973,6 +1973,57 @@ static const struct pptable_funcs arcturus_ppt_funcs = { .get_power_limit = arcturus_get_power_limit, .is_dpm_running = arcturus_is_dpm_running, .dpm_set_uvd_enable = arcturus_dpm_set_uvd_enable, + .init_microcode = smu_v11_0_init_microcode, + .load_microcode = smu_v11_0_load_microcode, + .init_smc_tables = smu_v11_0_init_smc_tables, + .fini_smc_tables = smu_v11_0_fini_smc_tables, + .init_power = smu_v11_0_init_power, + .fini_power = smu_v11_0_fini_power, + .check_fw_status = smu_v11_0_check_fw_status, + .setup_pptable = smu_v11_0_setup_pptable, + .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, + .get_clk_info_from_vbios = smu_v11_0_get_clk_info_from_vbios, + .check_pptable = smu_v11_0_check_pptable, + .parse_pptable = smu_v11_0_parse_pptable, + .populate_smc_tables = smu_v11_0_populate_smc_pptable, + .check_fw_version = smu_v11_0_check_fw_version, + .write_pptable = smu_v11_0_write_pptable, + .set_min_dcef_deep_sleep = smu_v11_0_set_min_dcef_deep_sleep, + .set_tool_table_location = smu_v11_0_set_tool_table_location, + .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, + .write_watermarks_table = smu_v11_0_write_watermarks_table, + .system_features_control = smu_v11_0_system_features_control, + .send_smc_msg = smu_v11_0_send_msg, + .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, + .read_smc_arg = smu_v11_0_read_arg, + .init_display_count = smu_v11_0_init_display_count, + .set_allowed_mask = smu_v11_0_set_allowed_mask, + .get_enabled_mask = smu_v11_0_get_enabled_mask, + .notify_display_change = smu_v11_0_notify_display_change, + .set_power_limit = smu_v11_0_set_power_limit, + .get_current_clk_freq = smu_v11_0_get_current_clk_freq, + .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, + .start_thermal_control = smu_v11_0_start_thermal_control, + .stop_thermal_control = smu_v11_0_stop_thermal_control, + .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, + .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, + .set_watermarks_for_clock_ranges = smu_v11_0_set_watermarks_for_clock_ranges, + .get_fan_control_mode = smu_v11_0_get_fan_control_mode, + .set_fan_control_mode = smu_v11_0_set_fan_control_mode, + .set_fan_speed_percent = smu_v11_0_set_fan_speed_percent, + .set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm, + .set_xgmi_pstate = smu_v11_0_set_xgmi_pstate, + .gfx_off_control = smu_v11_0_gfx_off_control, + .register_irq_handler = smu_v11_0_register_irq_handler, + .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, + .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, + .baco_is_support= smu_v11_0_baco_is_support, + .baco_get_state = smu_v11_0_baco_get_state, + .baco_set_state = smu_v11_0_baco_set_state, + .baco_reset = smu_v11_0_baco_reset, + .get_dpm_ultimate_freq = smu_v11_0_get_dpm_ultimate_freq, + .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, + .override_pcie_parameters = smu_v11_0_override_pcie_parameters, };void arcturus_set_ppt_funcs (struct smu_context *smu)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@@ -131,6 +131,131 @@ enum smu_v11_0_baco_seq { BACO_SEQ_COUNT, }; -void smu_v11_0_set_smu_funcs (struct smu_context *smu); +int smu_v11_0_init_microcode (struct smu_context *smu); + +int smu_v11_0_load_microcode (struct smu_context *smu); + +int smu_v11_0_init_smc_tables (struct smu_context *smu); + +int smu_v11_0_fini_smc_tables (struct smu_context *smu); + +int smu_v11_0_init_power (struct smu_context *smu); + +int smu_v11_0_fini_power (struct smu_context *smu); + +int smu_v11_0_check_fw_status (struct smu_context *smu); + +int smu_v11_0_setup_pptable (struct smu_context *smu); + +int smu_v11_0_get_vbios_bootup_values (struct smu_context *smu); + +int smu_v11_0_get_clk_info_from_vbios (struct smu_context *smu); + +int smu_v11_0_check_pptable (struct smu_context *smu); + +int smu_v11_0_parse_pptable (struct smu_context *smu); + +int smu_v11_0_populate_smc_pptable (struct smu_context *smu); + +int smu_v11_0_check_fw_version (struct smu_context *smu); + +int smu_v11_0_write_pptable (struct smu_context *smu); + +int smu_v11_0_set_min_dcef_deep_sleep (struct smu_context *smu); + +int smu_v11_0_set_tool_table_location (struct smu_context *smu); + +int smu_v11_0_notify_memory_pool_location (struct smu_context *smu); + +int smu_v11_0_write_watermarks_table (struct smu_context *smu); + +int smu_v11_0_system_features_control (struct smu_context *smu, +bool en); + +int smu_v11_0_send_msg (struct smu_context *smu,uint16_t msg); + +int +smu_v11_0_send_msg_with_param (struct smu_context *smu,uint16_t msg, +uint32_t param); + +int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg); + +int smu_v11_0_init_display_count (struct smu_context *smu,uint32_t count); + +int smu_v11_0_set_allowed_mask (struct smu_context *smu); + +int smu_v11_0_get_enabled_mask (struct smu_context *smu, +uint32_t *feature_mask,uint32_t num); + +int smu_v11_0_notify_display_change (struct smu_context *smu); + +int smu_v11_0_set_power_limit (struct smu_context *smu,uint32_t n); + +int smu_v11_0_get_current_clk_freq (struct smu_context *smu, +enum smu_clk_type clk_id, +uint32_t *value); + +int smu_v11_0_init_max_sustainable_clocks (struct smu_context *smu); + +int smu_v11_0_start_thermal_control (struct smu_context *smu); + +int smu_v11_0_stop_thermal_control (struct smu_context *smu); + +int smu_v11_0_read_sensor (struct smu_context *smu, +enum amd_pp_sensors sensor, +void *data,uint32_t *size); + +int smu_v11_0_set_deep_sleep_dcefclk (struct smu_context *smu,uint32_t clk); + +int +smu_v11_0_display_clock_voltage_request (struct smu_context *smu, +struct pp_display_clock_request + *clock_req); + +int +smu_v11_0_set_watermarks_for_clock_ranges (struct smu_context *smu,struct +dm_pp_wm_sets_with_clock_ranges_soc15 + *clock_ranges); + +uint32_t +smu_v11_0_get_fan_control_mode (struct smu_context *smu); + +int +smu_v11_0_set_fan_control_mode (struct smu_context *smu, +uint32_t mode); + +int +smu_v11_0_set_fan_speed_percent (struct smu_context *smu,uint32_t speed); + +int smu_v11_0_set_fan_speed_rpm (struct smu_context *smu, +uint32_t speed); + +int smu_v11_0_set_xgmi_pstate (struct smu_context *smu, +uint32_t pstate); + +int smu_v11_0_gfx_off_control (struct smu_context *smu,bool enable); + +int smu_v11_0_register_irq_handler (struct smu_context *smu); + +int smu_v11_0_set_azalia_d3_pme (struct smu_context *smu); + +int smu_v11_0_get_max_sustainable_clocks_by_dc (struct smu_context *smu, +struct pp_smu_nv_clock_table *max_clocks); + +bool smu_v11_0_baco_is_support (struct smu_context *smu); + +enum smu_baco_state smu_v11_0_baco_get_state (struct smu_context *smu); + +int smu_v11_0_baco_set_state (struct smu_context *smu,enum smu_baco_state state); + +int smu_v11_0_baco_reset (struct smu_context *smu); + +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type, +uint32_t *min,uint32_t *max); + +int smu_v11_0_set_soft_freq_limited_range (struct smu_context *smu,enum smu_clk_type clk_type, +uint32_t min,uint32_t max); + +int smu_v11_0_override_pcie_parameters (struct smu_context *smu);#endif drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +40
-1@@ -37,6 +37,45 @@ struct smu_12_0_cmn2aisc_mapping {int map_to; }; -void smu_v12_0_set_smu_funcs (struct smu_context *smu); +int smu_v12_0_send_msg_without_waiting (struct smu_context *smu, +uint16_t msg); + +int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg); + +int smu_v12_0_wait_for_response (struct smu_context *smu); + +int smu_v12_0_send_msg (struct smu_context *smu,uint16_t msg); + +int +smu_v12_0_send_msg_with_param (struct smu_context *smu,uint16_t msg, +uint32_t param); + +int smu_v12_0_check_fw_status (struct smu_context *smu); + +int smu_v12_0_check_fw_version (struct smu_context *smu); + +int smu_v12_0_powergate_sdma (struct smu_context *smu,bool gate); + +int smu_v12_0_powergate_vcn (struct smu_context *smu,bool gate); + +int smu_v12_0_set_gfx_cgpg (struct smu_context *smu,bool enable); + +uint32_t smu_v12_0_get_gfxoff_status (struct smu_context *smu); + +int smu_v12_0_gfx_off_control (struct smu_context *smu,bool enable); + +int smu_v12_0_init_smc_tables (struct smu_context *smu); + +int smu_v12_0_fini_smc_tables (struct smu_context *smu); + +int smu_v12_0_populate_smc_tables (struct smu_context *smu); + +int smu_v12_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type, +uint32_t *min,uint32_t *max); + +int smu_v12_0_mode2_reset (struct smu_context *smu); + +int smu_v12_0_set_soft_freq_limited_range (struct smu_context *smu,enum smu_clk_type clk_type, +uint32_t min,uint32_t max);#endif drivers/gpu/drm/amd/powerplay/navi10_ppt.c +53
-3@@ -1268,8 +1268,7 @@ static int navi10_notify_smc_dispaly_config(struct smu_context *smu) clock_req.clock_type = amd_pp_dcef_clock; clock_req.clock_freq_in_khz = min_clocks.dcef_clock *10 ; -if (smu->funcs->display_clock_voltage_request) - ret = smu->funcs->display_clock_voltage_request (smu, &clock_req); + ret =smu_v11_0_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,@@ -1424,7 +1423,7 @@ static int navi10_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_smc_read_sensor (smu, sensor, data, size); + ret =smu_v11_0_read_sensor (smu, sensor, data, size); }mutex_unlock (&smu->sensor_lock);@@ -1693,6 +1692,57 @@ static const struct pptable_funcs navi10_ppt_funcs = { .display_disable_memory_clock_switch = navi10_display_disable_memory_clock_switch, .get_power_limit = navi10_get_power_limit, .update_pcie_parameters = navi10_update_pcie_parameters, + .init_microcode = smu_v11_0_init_microcode, + .load_microcode = smu_v11_0_load_microcode, + .init_smc_tables = smu_v11_0_init_smc_tables, + .fini_smc_tables = smu_v11_0_fini_smc_tables, + .init_power = smu_v11_0_init_power, + .fini_power = smu_v11_0_fini_power, + .check_fw_status = smu_v11_0_check_fw_status, + .setup_pptable = smu_v11_0_setup_pptable, + .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, + .get_clk_info_from_vbios = smu_v11_0_get_clk_info_from_vbios, + .check_pptable = smu_v11_0_check_pptable, + .parse_pptable = smu_v11_0_parse_pptable, + .populate_smc_tables = smu_v11_0_populate_smc_pptable, + .check_fw_version = smu_v11_0_check_fw_version, + .write_pptable = smu_v11_0_write_pptable, + .set_min_dcef_deep_sleep = smu_v11_0_set_min_dcef_deep_sleep, + .set_tool_table_location = smu_v11_0_set_tool_table_location, + .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, + .write_watermarks_table = smu_v11_0_write_watermarks_table, + .system_features_control = smu_v11_0_system_features_control, + .send_smc_msg = smu_v11_0_send_msg, + .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, + .read_smc_arg = smu_v11_0_read_arg, + .init_display_count = smu_v11_0_init_display_count, + .set_allowed_mask = smu_v11_0_set_allowed_mask, + .get_enabled_mask = smu_v11_0_get_enabled_mask, + .notify_display_change = smu_v11_0_notify_display_change, + .set_power_limit = smu_v11_0_set_power_limit, + .get_current_clk_freq = smu_v11_0_get_current_clk_freq, + .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, + .start_thermal_control = smu_v11_0_start_thermal_control, + .stop_thermal_control = smu_v11_0_stop_thermal_control, + .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, + .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, + .set_watermarks_for_clock_ranges = smu_v11_0_set_watermarks_for_clock_ranges, + .get_fan_control_mode = smu_v11_0_get_fan_control_mode, + .set_fan_control_mode = smu_v11_0_set_fan_control_mode, + .set_fan_speed_percent = smu_v11_0_set_fan_speed_percent, + .set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm, + .set_xgmi_pstate = smu_v11_0_set_xgmi_pstate, + .gfx_off_control = smu_v11_0_gfx_off_control, + .register_irq_handler = smu_v11_0_register_irq_handler, + .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, + .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, + .baco_is_support= smu_v11_0_baco_is_support, + .baco_get_state = smu_v11_0_baco_get_state, + .baco_set_state = smu_v11_0_baco_set_state, + .baco_reset = smu_v11_0_baco_reset, + .get_dpm_ultimate_freq = smu_v11_0_get_dpm_ultimate_freq, + .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, + .override_pcie_parameters = smu_v11_0_override_pcie_parameters, };void navi10_set_ppt_funcs (struct smu_context *smu)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_cmn.h +42
-42@@ -26,75 +26,75 @@#include "amdgpu_smu.h" #define smu_init_microcode (smu) \ - ((smu)->funcs->init_microcode ? (smu)->funcs->init_microcode((smu)) : 0) + ((smu)->ppt_funcs->init_microcode ? (smu)->ppt_funcs->init_microcode((smu)) : 0)#define smu_init_smc_tables (smu) \ - ((smu)->funcs->init_smc_tables ? (smu)->funcs->init_smc_tables((smu)) : 0) + ((smu)->ppt_funcs->init_smc_tables ? (smu)->ppt_funcs->init_smc_tables((smu)) : 0)#define smu_fini_smc_tables (smu) \ - ((smu)->funcs->fini_smc_tables ? (smu)->funcs->fini_smc_tables((smu)) : 0) + ((smu)->ppt_funcs->fini_smc_tables ? (smu)->ppt_funcs->fini_smc_tables((smu)) : 0)#define smu_init_power (smu) \ - ((smu)->funcs->init_power ? (smu)->funcs->init_power((smu)) : 0) + ((smu)->ppt_funcs->init_power ? (smu)->ppt_funcs->init_power((smu)) : 0)#define smu_fini_power (smu) \ - ((smu)->funcs->fini_power ? (smu)->funcs->fini_power((smu)) : 0) + ((smu)->ppt_funcs->fini_power ? (smu)->ppt_funcs->fini_power((smu)) : 0)#define smu_setup_pptable (smu) \ - ((smu)->funcs->setup_pptable ? (smu)->funcs->setup_pptable((smu)) : 0) + ((smu)->ppt_funcs->setup_pptable ? (smu)->ppt_funcs->setup_pptable((smu)) : 0)#define smu_powergate_sdma (smu, gate) \ - ((smu)->funcs->powergate_sdma ? (smu)->funcs->powergate_sdma((smu), (gate)) : 0) + ((smu)->ppt_funcs->powergate_sdma ? (smu)->ppt_funcs->powergate_sdma((smu), (gate)) : 0)#define smu_powergate_vcn (smu, gate) \ - ((smu)->funcs->powergate_vcn ? (smu)->funcs->powergate_vcn((smu), (gate)) : 0) + ((smu)->ppt_funcs->powergate_vcn ? (smu)->ppt_funcs->powergate_vcn((smu), (gate)) : 0)#define smu_get_vbios_bootup_values (smu) \ - ((smu)->funcs->get_vbios_bootup_values ? (smu)->funcs->get_vbios_bootup_values((smu)) : 0) + ((smu)->ppt_funcs->get_vbios_bootup_values ? (smu)->ppt_funcs->get_vbios_bootup_values((smu)) : 0)#define smu_get_clk_info_from_vbios (smu) \ - ((smu)->funcs->get_clk_info_from_vbios ? (smu)->funcs->get_clk_info_from_vbios((smu)) : 0) + ((smu)->ppt_funcs->get_clk_info_from_vbios ? (smu)->ppt_funcs->get_clk_info_from_vbios((smu)) : 0)#define smu_check_pptable (smu) \ - ((smu)->funcs->check_pptable ? (smu)->funcs->check_pptable((smu)) : 0) + ((smu)->ppt_funcs->check_pptable ? (smu)->ppt_funcs->check_pptable((smu)) : 0)#define smu_parse_pptable (smu) \ - ((smu)->funcs->parse_pptable ? (smu)->funcs->parse_pptable((smu)) : 0) + ((smu)->ppt_funcs->parse_pptable ? (smu)->ppt_funcs->parse_pptable((smu)) : 0)#define smu_populate_smc_tables (smu) \ - ((smu)->funcs->populate_smc_tables ? (smu)->funcs->populate_smc_tables((smu)) : 0) + ((smu)->ppt_funcs->populate_smc_tables ? (smu)->ppt_funcs->populate_smc_tables((smu)) : 0)#define smu_check_fw_version (smu) \ - ((smu)->funcs->check_fw_version ? (smu)->funcs->check_fw_version((smu)) : 0) + ((smu)->ppt_funcs->check_fw_version ? (smu)->ppt_funcs->check_fw_version((smu)) : 0)#define smu_write_pptable (smu) \ - ((smu)->funcs->write_pptable ? (smu)->funcs->write_pptable((smu)) : 0) + ((smu)->ppt_funcs->write_pptable ? (smu)->ppt_funcs->write_pptable((smu)) : 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) + ((smu)->ppt_funcs->set_min_dcef_deep_sleep ? (smu)->ppt_funcs->set_min_dcef_deep_sleep((smu)) : 0)#define smu_set_tool_table_location (smu) \ - ((smu)->funcs->set_tool_table_location ? (smu)->funcs->set_tool_table_location((smu)) : 0) + ((smu)->ppt_funcs->set_tool_table_location ? (smu)->ppt_funcs->set_tool_table_location((smu)) : 0)#define smu_notify_memory_pool_location (smu) \ - ((smu)->funcs->notify_memory_pool_location ? (smu)->funcs->notify_memory_pool_location((smu)) : 0) + ((smu)->ppt_funcs->notify_memory_pool_location ? (smu)->ppt_funcs->notify_memory_pool_location((smu)) : 0)#define smu_gfx_off_control (smu, enable) \ - ((smu)->funcs->gfx_off_control ? (smu)->funcs->gfx_off_control((smu), (enable)) : 0) + ((smu)->ppt_funcs->gfx_off_control ? (smu)->ppt_funcs->gfx_off_control((smu), (enable)) : 0)#define smu_write_watermarks_table (smu) \ - ((smu)->funcs->write_watermarks_table ? (smu)->funcs->write_watermarks_table((smu)) : 0) + ((smu)->ppt_funcs->write_watermarks_table ? (smu)->ppt_funcs->write_watermarks_table((smu)) : 0)#define smu_set_last_dcef_min_deep_sleep_clk (smu) \ - ((smu)->funcs->set_last_dcef_min_deep_sleep_clk ? (smu)->funcs->set_last_dcef_min_deep_sleep_clk((smu)) : 0) + ((smu)->ppt_funcs->set_last_dcef_min_deep_sleep_clk ? (smu)->ppt_funcs->set_last_dcef_min_deep_sleep_clk((smu)) : 0)#define smu_system_features_control (smu, en) \ - ((smu)->funcs->system_features_control ? (smu)->funcs->system_features_control((smu), (en)) : 0) + ((smu)->ppt_funcs->system_features_control ? (smu)->ppt_funcs->system_features_control((smu), (en)) : 0)#define smu_init_max_sustainable_clocks (smu) \ - ((smu)->funcs->init_max_sustainable_clocks ? (smu)->funcs->init_max_sustainable_clocks((smu)) : 0) + ((smu)->ppt_funcs->init_max_sustainable_clocks ? (smu)->ppt_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_send_smc_msg (smu, msg) \ - ((smu)->funcs->send_smc_msg? (smu)->funcs->send_smc_msg((smu), (msg)) : 0) + ((smu)->ppt_funcs->send_smc_msg? (smu)->ppt_funcs->send_smc_msg((smu), (msg)) : 0)#define smu_send_smc_msg_with_param (smu, msg, param) \ - ((smu)->funcs->send_smc_msg_with_param? (smu)->funcs->send_smc_msg_with_param((smu), (msg), (param)) : 0) + ((smu)->ppt_funcs->send_smc_msg_with_param? (smu)->ppt_funcs->send_smc_msg_with_param((smu), (msg), (param)) : 0)#define smu_read_smc_arg (smu, arg) \ - ((smu)->funcs->read_smc_arg? (smu)->funcs->read_smc_arg((smu), (arg)) : 0) + ((smu)->ppt_funcs->read_smc_arg? (smu)->ppt_funcs->read_smc_arg((smu), (arg)) : 0)#define smu_alloc_dpm_context (smu) \ ((smu)->ppt_funcs->alloc_dpm_context ? (smu)->ppt_funcs->alloc_dpm_context((smu)) : 0)#define smu_init_display_count (smu, count) \ - ((smu)->funcs->init_display_count ? (smu)->funcs->init_display_count((smu), (count)) : 0) + ((smu)->ppt_funcs->init_display_count ? (smu)->ppt_funcs->init_display_count((smu), (count)) : 0)#define smu_feature_set_allowed_mask (smu) \ - ((smu)->funcs->set_allowed_mask? (smu)->funcs->set_allowed_mask((smu)) : 0) + ((smu)->ppt_funcs->set_allowed_mask? (smu)->ppt_funcs->set_allowed_mask((smu)) : 0)#define smu_feature_get_enabled_mask (smu, mask, num) \ - ((smu)->funcs->get_enabled_mask? (smu)->funcs->get_enabled_mask((smu), (mask), (num)) : 0) + ((smu)->ppt_funcs->get_enabled_mask? (smu)->ppt_funcs->get_enabled_mask((smu), (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) \ - ((smu)->funcs->notify_display_change? (smu)->funcs->notify_display_change((smu)) : 0) + ((smu)->ppt_funcs->notify_display_change? (smu)->ppt_funcs->notify_display_change((smu)) : 0)#define smu_store_powerplay_table (smu) \ ((smu)->ppt_funcs->store_powerplay_table ? (smu)->ppt_funcs->store_powerplay_table((smu)) : 0)#define smu_check_powerplay_table (smu) \@@ -109,19 +109,19 @@ ((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) + ((smu)->ppt_funcs->get_current_clk_freq? (smu)->ppt_funcs->get_current_clk_freq((smu), (clk_id), (value)) : 0)#define smu_tables_init (smu, tab) \ ((smu)->ppt_funcs->tables_init ? (smu)->ppt_funcs->tables_init((smu), (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) \ - ((smu)->funcs->start_thermal_control? (smu)->funcs->start_thermal_control((smu)) : 0) + ((smu)->ppt_funcs->start_thermal_control? (smu)->ppt_funcs->start_thermal_control((smu)) : 0)#define smu_stop_thermal_control (smu) \ - ((smu)->funcs->stop_thermal_control? (smu)->funcs->stop_thermal_control((smu)) : 0) + ((smu)->ppt_funcs->stop_thermal_control? (smu)->ppt_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), (data), (size)) : -EINVAL) + ((smu)->ppt_funcs->read_sensor? (smu)->ppt_funcs->read_sensor((smu), (sensor), (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)@@ -159,14 +159,14 @@#define smu_store_cc6_data (smu, st, cc6_dis, pst_dis, pst_sw_dis) \ - ((smu)->funcs->store_cc6_data ? (smu)->funcs->store_cc6_data((smu), (st), (cc6_dis), (pst_dis), (pst_sw_dis)) : 0) + ((smu)->ppt_funcs->store_cc6_data ? (smu)->ppt_funcs->store_cc6_data((smu), (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) + ((smu)->ppt_funcs->get_dal_power_level ? (smu)->ppt_funcs->get_dal_power_level((smu), (clocks)) : 0)#define smu_get_perf_level (smu, designation, level) \ - ((smu)->funcs->get_perf_level ? (smu)->funcs->get_perf_level((smu), (designation), (level)) : 0) + ((smu)->ppt_funcs->get_perf_level ? (smu)->ppt_funcs->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->get_current_shallow_sleep_clocks((smu), (clocks)) : 0) + ((smu)->ppt_funcs->get_current_shallow_sleep_clocks ? (smu)->ppt_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)@@ -182,10 +182,10 @@#define smu_get_thermal_temperature_range (smu, range) \ ((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) + ((smu)->ppt_funcs->register_irq_handler ? (smu)->ppt_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) + ((smu)->ppt_funcs->get_dpm_ultimate_freq ? (smu)->ppt_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);@@ -195,10 +195,10 @@ ((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) + ((smu)->ppt_funcs->set_soft_freq_limited_range ? (smu)->ppt_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) + ((smu)->ppt_funcs->override_pcie_parameters ? (smu)->ppt_funcs->override_pcie_parameters((smu)) : 0)#define smu_update_pcie_parameters (smu, pcie_gen_cap, pcie_width_cap) \ ((smu)->ppt_funcs->update_pcie_parameters ? (smu)->ppt_funcs->update_pcie_parameters((smu), (pcie_gen_cap), (pcie_width_cap)) : 0)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +52
-137@@ -30,9 +30,6 @@#include "smu_v11_0.h" #include "soc15_common.h" #include "atom.h" -#include "vega20_ppt.h" -#include "arcturus_ppt.h" -#include "navi10_ppt.h" #include "amd_pcie.h" #include "asic_reg/thm/thm_11_0_2_offset.h" @@ -60,7 +57,7 @@ static int smu_v11_0_send_msg_without_waiting(struct smu_context *smu,return 0 ; } -static int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg) +int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg) {struct amdgpu_device *adev = smu->adev;@@ -87,7 +84,7 @@ static int smu_v11_0_wait_for_response(struct smu_context *smu)return RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90) ==0x1 ?0 : -EIO ; } -static int smu_v11_0_send_msg (struct smu_context *smu,uint16_t msg) +int smu_v11_0_send_msg (struct smu_context *smu,uint16_t msg) {struct amdgpu_device *adev = smu->adev;int ret =0 , index =0 ;@@ -112,7 +109,7 @@ static int smu_v11_0_send_msg(struct smu_context *smu, uint16_t msg) } -static int +int smu_v11_0_send_msg_with_param (struct smu_context *smu,uint16_t msg,uint32_t param) {@@ -143,7 +140,7 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu, uint16_t msg,return ret; } -static int smu_v11_0_init_microcode (struct smu_context *smu) +int smu_v11_0_init_microcode (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;const char *chip_name;@@ -205,7 +202,7 @@ static int smu_v11_0_init_microcode(struct smu_context *smu)return err; } -static int smu_v11_0_load_microcode (struct smu_context *smu) +int smu_v11_0_load_microcode (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;const uint32_t *src;@@ -243,7 +240,7 @@ static int smu_v11_0_load_microcode(struct smu_context *smu)return 0 ; } -static int smu_v11_0_check_fw_status (struct smu_context *smu) +int smu_v11_0_check_fw_status (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags;@@ -258,7 +255,7 @@ static int smu_v11_0_check_fw_status(struct smu_context *smu)return -EIO ; } -static int smu_v11_0_check_fw_version (struct smu_context *smu) +int smu_v11_0_check_fw_version (struct smu_context *smu) {uint32_t if_version =0xff , smu_version =0xff ;uint16_t smu_major;@@ -356,7 +353,7 @@ static int smu_v11_0_set_pptable_v2_1(struct smu_context *smu, void **table,return 0 ; } -static int smu_v11_0_setup_pptable (struct smu_context *smu) +int smu_v11_0_setup_pptable (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;const struct smc_firmware_header_v1_0 *hdr;@@ -435,7 +432,7 @@ static int smu_v11_0_fini_dpm_context(struct smu_context *smu)return 0 ; } -static int smu_v11_0_init_smc_tables (struct smu_context *smu) +int smu_v11_0_init_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *tables =NULL ;@@ -462,7 +459,7 @@ static int smu_v11_0_init_smc_tables(struct smu_context *smu)return 0 ; } -static int smu_v11_0_fini_smc_tables (struct smu_context *smu) +int smu_v11_0_fini_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;int ret =0 ;@@ -482,7 +479,7 @@ static int smu_v11_0_fini_smc_tables(struct smu_context *smu)return 0 ; } -static int smu_v11_0_init_power (struct smu_context *smu) +int smu_v11_0_init_power (struct smu_context *smu) {struct smu_power_context *smu_power = &smu->smu_power;@@ -500,7 +497,7 @@ static int smu_v11_0_init_power(struct smu_context *smu)return 0 ; } -static int smu_v11_0_fini_power (struct smu_context *smu) +int smu_v11_0_fini_power (struct smu_context *smu) {struct smu_power_context *smu_power = &smu->smu_power;@@ -577,7 +574,7 @@ int smu_v11_0_get_vbios_bootup_values(struct smu_context *smu)return 0 ; } -static int smu_v11_0_get_clk_info_from_vbios (struct smu_context *smu) +int smu_v11_0_get_clk_info_from_vbios (struct smu_context *smu) {int ret, index;struct amdgpu_device *adev = smu->adev;@@ -674,7 +671,7 @@ static int smu_v11_0_get_clk_info_from_vbios(struct smu_context *smu)return 0 ; } -static int smu_v11_0_notify_memory_pool_location (struct smu_context *smu) +int smu_v11_0_notify_memory_pool_location (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *memory_pool = &smu_table->memory_pool;@@ -720,7 +717,7 @@ static int smu_v11_0_notify_memory_pool_location(struct smu_context *smu)return ret; } -static int smu_v11_0_check_pptable (struct smu_context *smu) +int smu_v11_0_check_pptable (struct smu_context *smu) {int ret;@@ -728,7 +725,7 @@ static int smu_v11_0_check_pptable(struct smu_context *smu)return ret; } -static int smu_v11_0_parse_pptable (struct smu_context *smu) +int smu_v11_0_parse_pptable (struct smu_context *smu) {int ret;@@ -752,7 +749,7 @@ static int smu_v11_0_parse_pptable(struct smu_context *smu)return ret; } -static int smu_v11_0_populate_smc_pptable (struct smu_context *smu) +int smu_v11_0_populate_smc_pptable (struct smu_context *smu) {int ret;@@ -761,7 +758,7 @@ static int smu_v11_0_populate_smc_pptable(struct smu_context *smu)return ret; } -static int smu_v11_0_write_pptable (struct smu_context *smu) +int smu_v11_0_write_pptable (struct smu_context *smu) {struct smu_table_context *table_context = &smu->smu_table;int ret =0 ;@@ -772,7 +769,7 @@ static int smu_v11_0_write_pptable(struct smu_context *smu)return ret; } -static int smu_v11_0_write_watermarks_table (struct smu_context *smu) +int smu_v11_0_write_watermarks_table (struct smu_context *smu) {int ret =0 ;struct smu_table_context *smu_table = &smu->smu_table;@@ -789,7 +786,7 @@ static int smu_v11_0_write_watermarks_table(struct smu_context *smu)return ret; } -static int smu_v11_0_set_deep_sleep_dcefclk (struct smu_context *smu,uint32_t clk) +int smu_v11_0_set_deep_sleep_dcefclk (struct smu_context *smu,uint32_t clk) {int ret;@@ -801,7 +798,7 @@ static int smu_v11_0_set_deep_sleep_dcefclk(struct smu_context *smu, uint32_t clreturn ret; } -static int smu_v11_0_set_min_dcef_deep_sleep (struct smu_context *smu) +int smu_v11_0_set_min_dcef_deep_sleep (struct smu_context *smu) {struct smu_table_context *table_context = &smu->smu_table;@@ -810,14 +807,10 @@ static int smu_v11_0_set_min_dcef_deep_sleep(struct smu_context *smu)if (!table_context)return -EINVAL ; -if (smu->funcs->set_deep_sleep_dcefclk) -return smu->funcs->set_deep_sleep_dcefclk (smu, - table_context->boot_values.dcefclk /100 ); - -return 0 ; +return smu_v11_0_set_deep_sleep_dcefclk (smu, table_context->boot_values.dcefclk /100 ); } -static int smu_v11_0_set_tool_table_location (struct smu_context *smu) +int smu_v11_0_set_tool_table_location (struct smu_context *smu) {int ret =0 ;struct smu_table *tool_table = &smu->smu_table.tables[SMU_TABLE_PMSTATUSLOG ];@@ -835,7 +828,7 @@ static int smu_v11_0_set_tool_table_location(struct smu_context *smu)return ret; } -static int smu_v11_0_init_display_count (struct smu_context *smu,uint32_t count) +int smu_v11_0_init_display_count (struct smu_context *smu,uint32_t count) {int ret =0 ;@@ -847,7 +840,7 @@ static int smu_v11_0_init_display_count(struct smu_context *smu, uint32_t count) } -static int smu_v11_0_set_allowed_mask (struct smu_context *smu) +int smu_v11_0_set_allowed_mask (struct smu_context *smu) {struct smu_feature *feature = &smu->smu_feature;int ret =0 ;@@ -874,7 +867,7 @@ static int smu_v11_0_set_allowed_mask(struct smu_context *smu)return ret; } -static int smu_v11_0_get_enabled_mask (struct smu_context *smu, +int smu_v11_0_get_enabled_mask (struct smu_context *smu,uint32_t *feature_mask,uint32_t num) {uint32_t feature_mask_high =0 , feature_mask_low =0 ;@@ -903,7 +896,7 @@ static int smu_v11_0_get_enabled_mask(struct smu_context *smu,return ret; } -static int smu_v11_0_system_features_control (struct smu_context *smu, +int smu_v11_0_system_features_control (struct smu_context *smu,bool en) {struct smu_feature *feature = &smu->smu_feature;@@ -929,7 +922,7 @@ static int smu_v11_0_system_features_control(struct smu_context *smu,return ret; } -static int smu_v11_0_notify_display_change (struct smu_context *smu) +int smu_v11_0_notify_display_change (struct smu_context *smu) {int ret =0 ;@@ -987,7 +980,7 @@ smu_v11_0_get_max_sustainable_clock(struct smu_context *smu, uint32_t *clock,return ret; } -static int smu_v11_0_init_max_sustainable_clocks (struct smu_context *smu) +int smu_v11_0_init_max_sustainable_clocks (struct smu_context *smu) {struct smu_11_0_max_sustainable_clocks *max_sustainable_clocks;int ret =0 ;@@ -1067,7 +1060,7 @@ static int smu_v11_0_init_max_sustainable_clocks(struct smu_context *smu)return 0 ; } -static int smu_v11_0_set_power_limit (struct smu_context *smu,uint32_t n) +int smu_v11_0_set_power_limit (struct smu_context *smu,uint32_t n) {int ret =0 ;@@ -1095,7 +1088,7 @@ static int smu_v11_0_set_power_limit(struct smu_context *smu, uint32_t n)return 0 ; } -static int smu_v11_0_get_current_clk_freq (struct smu_context *smu, +int smu_v11_0_get_current_clk_freq (struct smu_context *smu,enum smu_clk_type clk_id,uint32_t *value) {@@ -1174,7 +1167,7 @@ static int smu_v11_0_enable_thermal_alert(struct smu_context *smu)return 0 ; } -static int smu_v11_0_start_thermal_control (struct smu_context *smu) +int smu_v11_0_start_thermal_control (struct smu_context *smu) {int ret =0 ;struct smu_temperature_range range;@@ -1216,7 +1209,7 @@ static int smu_v11_0_start_thermal_control(struct smu_context *smu)return ret; } -static int smu_v11_0_stop_thermal_control (struct smu_context *smu) +int smu_v11_0_stop_thermal_control (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;@@ -1249,7 +1242,7 @@ static int smu_v11_0_get_gfx_vdd(struct smu_context *smu, uint32_t *value) } -static int smu_v11_0_read_sensor (struct smu_context *smu, +int smu_v11_0_read_sensor (struct smu_context *smu,enum amd_pp_sensors sensor,void *data,uint32_t *size) {@@ -1286,7 +1279,7 @@ static int smu_v11_0_read_sensor(struct smu_context *smu,return ret; } -static int +int smu_v11_0_display_clock_voltage_request (struct smu_context *smu,struct pp_display_clock_request *clock_req)@@ -1339,7 +1332,7 @@ smu_v11_0_display_clock_voltage_request(struct smu_context *smu,return ret; } -static int +int smu_v11_0_set_watermarks_for_clock_ranges (struct smu_context *smu,struct dm_pp_wm_sets_with_clock_ranges_soc15 *clock_ranges)@@ -1359,7 +1352,7 @@ smu_v11_0_set_watermarks_for_clock_ranges(struct smu_context *smu, structreturn ret; } -static int smu_v11_0_gfx_off_control (struct smu_context *smu,bool enable) +int smu_v11_0_gfx_off_control (struct smu_context *smu,bool enable) {int ret =0 ;struct amdgpu_device *adev = smu->adev;@@ -1384,7 +1377,7 @@ static int smu_v11_0_gfx_off_control(struct smu_context *smu, bool enable)return ret; } -static uint32_t +uint32_t smu_v11_0_get_fan_control_mode (struct smu_context *smu) {if (!smu_feature_is_enabled (smu,SMU_FEATURE_FAN_CONTROL_BIT ))@@ -1424,7 +1417,7 @@ smu_v11_0_set_fan_static_mode(struct smu_context *smu, uint32_t mode)return 0 ; } -static int +int smu_v11_0_set_fan_speed_percent (struct smu_context *smu,uint32_t speed) {struct amdgpu_device *adev = smu->adev;@@ -1453,7 +1446,7 @@ smu_v11_0_set_fan_speed_percent(struct smu_context *smu, uint32_t speed)return smu_v11_0_set_fan_static_mode (smu,FDO_PWM_MODE_STATIC ); } -static int +int smu_v11_0_set_fan_control_mode (struct smu_context *smu,uint32_t mode) {@@ -1481,7 +1474,7 @@ smu_v11_0_set_fan_control_mode(struct smu_context *smu,return ret; } -static int smu_v11_0_set_fan_speed_rpm (struct smu_context *smu, +int smu_v11_0_set_fan_speed_rpm (struct smu_context *smu,uint32_t speed) {struct amdgpu_device *adev = smu->adev;@@ -1510,7 +1503,7 @@ static int smu_v11_0_set_fan_speed_rpm(struct smu_context *smu,#define XGMI_STATE_D0 1#define XGMI_STATE_D3 0 -static int smu_v11_0_set_xgmi_pstate (struct smu_context *smu, +int smu_v11_0_set_xgmi_pstate (struct smu_context *smu,uint32_t pstate) {int ret =0 ;@@ -1562,7 +1555,7 @@ static const struct amdgpu_irq_src_funcs smu_v11_0_irq_funcs= { .process = smu_v11_0_irq_process, }; -static int smu_v11_0_register_irq_handler (struct smu_context *smu) +int smu_v11_0_register_irq_handler (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;struct amdgpu_irq_src *irq_src = smu->irq_source;@@ -1594,7 +1587,7 @@ static int smu_v11_0_register_irq_handler(struct smu_context *smu)return ret; } -static int smu_v11_0_get_max_sustainable_clocks_by_dc (struct smu_context *smu, +int smu_v11_0_get_max_sustainable_clocks_by_dc (struct smu_context *smu,struct pp_smu_nv_clock_table *max_clocks) {struct smu_table_context *table_context = &smu->smu_table;@@ -1624,7 +1617,7 @@ static int smu_v11_0_get_max_sustainable_clocks_by_dc(struct smu_context *smu,return 0 ; } -static int smu_v11_0_set_azalia_d3_pme (struct smu_context *smu) +int smu_v11_0_set_azalia_d3_pme (struct smu_context *smu) {int ret =0 ;@@ -1638,7 +1631,7 @@ static int smu_v11_0_baco_set_armd3_sequence(struct smu_context *smu, enum smu_vreturn smu_send_smc_msg_with_param (smu, SMU_MSG_ArmD3, baco_seq); } -static bool smu_v11_0_baco_is_support (struct smu_context *smu) +bool smu_v11_0_baco_is_support (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;struct smu_baco_context *smu_baco = &smu->smu_baco;@@ -1671,7 +1664,7 @@ static bool smu_v11_0_baco_is_support(struct smu_context *smu)return false; } -static enum smu_baco_state smu_v11_0_baco_get_state (struct smu_context *smu) +enum smu_baco_state smu_v11_0_baco_get_state (struct smu_context *smu) {struct smu_baco_context *smu_baco = &smu->smu_baco;enum smu_baco_state baco_state;@@ -1683,7 +1676,7 @@ static enum smu_baco_state smu_v11_0_baco_get_state(struct smu_context *smu)return baco_state; } -static int smu_v11_0_baco_set_state (struct smu_context *smu,enum smu_baco_state state) +int smu_v11_0_baco_set_state (struct smu_context *smu,enum smu_baco_state state) {struct smu_baco_context *smu_baco = &smu->smu_baco;struct amdgpu_device *adev = smu->adev;@@ -1725,7 +1718,7 @@ static int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_statereturn ret; } -static int smu_v11_0_baco_reset (struct smu_context *smu) +int smu_v11_0_baco_reset (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;int ret =0 ;@@ -1754,7 +1747,7 @@ static int smu_v11_0_baco_reset(struct smu_context *smu)return ret; } -static int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type, +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max) {int ret =0 , clk_id =0 ;@@ -1789,7 +1782,7 @@ static int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clkreturn ret; } -static int smu_v11_0_set_soft_freq_limited_range (struct smu_context *smu,enum smu_clk_type clk_type, +int smu_v11_0_set_soft_freq_limited_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max) {int ret =0 , clk_id =0 ;@@ -1818,7 +1811,7 @@ static int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum sreturn ret; } -static int smu_v11_0_override_pcie_parameters (struct smu_context *smu) +int smu_v11_0_override_pcie_parameters (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;uint32_t pcie_gen =0 , pcie_width =0 ;@@ -1858,81 +1851,3 @@ static int smu_v11_0_override_pcie_parameters(struct smu_context *smu)return ret; } - - -static const struct smu_funcs smu_v11_0_funcs = { - .init_microcode = smu_v11_0_init_microcode, - .load_microcode = smu_v11_0_load_microcode, - .check_fw_status = smu_v11_0_check_fw_status, - .check_fw_version = smu_v11_0_check_fw_version, - .send_smc_msg = smu_v11_0_send_msg, - .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, - .read_smc_arg = smu_v11_0_read_arg, - .setup_pptable = smu_v11_0_setup_pptable, - .init_smc_tables = smu_v11_0_init_smc_tables, - .fini_smc_tables = smu_v11_0_fini_smc_tables, - .init_power = smu_v11_0_init_power, - .fini_power = smu_v11_0_fini_power, - .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, - .get_clk_info_from_vbios = smu_v11_0_get_clk_info_from_vbios, - .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, - .check_pptable = smu_v11_0_check_pptable, - .parse_pptable = smu_v11_0_parse_pptable, - .populate_smc_tables = smu_v11_0_populate_smc_pptable, - .write_pptable = smu_v11_0_write_pptable, - .write_watermarks_table = smu_v11_0_write_watermarks_table, - .set_min_dcef_deep_sleep = smu_v11_0_set_min_dcef_deep_sleep, - .set_tool_table_location = smu_v11_0_set_tool_table_location, - .init_display_count = smu_v11_0_init_display_count, - .set_allowed_mask = smu_v11_0_set_allowed_mask, - .get_enabled_mask = smu_v11_0_get_enabled_mask, - .system_features_control = smu_v11_0_system_features_control, - .notify_display_change = smu_v11_0_notify_display_change, - .set_power_limit = smu_v11_0_set_power_limit, - .get_current_clk_freq = smu_v11_0_get_current_clk_freq, - .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, - .start_thermal_control = smu_v11_0_start_thermal_control, - .stop_thermal_control = smu_v11_0_stop_thermal_control, - .read_sensor = smu_v11_0_read_sensor, - .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, - .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, - .set_watermarks_for_clock_ranges = smu_v11_0_set_watermarks_for_clock_ranges, - .get_fan_control_mode = smu_v11_0_get_fan_control_mode, - .set_fan_control_mode = smu_v11_0_set_fan_control_mode, - .set_fan_speed_percent = smu_v11_0_set_fan_speed_percent, - .set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm, - .set_xgmi_pstate = smu_v11_0_set_xgmi_pstate, - .gfx_off_control = smu_v11_0_gfx_off_control, - .register_irq_handler = smu_v11_0_register_irq_handler, - .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, - .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, - .baco_is_support= smu_v11_0_baco_is_support, - .baco_get_state = smu_v11_0_baco_get_state, - .baco_set_state = smu_v11_0_baco_set_state, - .baco_reset = smu_v11_0_baco_reset, - .get_dpm_ultimate_freq = smu_v11_0_get_dpm_ultimate_freq, - .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, - .override_pcie_parameters = smu_v11_0_override_pcie_parameters, -}; - -void smu_v11_0_set_smu_funcs (struct smu_context *smu) -{ -struct amdgpu_device *adev = smu->adev; - - smu->funcs = &smu_v11_0_funcs; -switch (adev->asic_type) { -case CHIP_VEGA20 : -vega20_set_ppt_funcs (smu); -break ; -case CHIP_ARCTURUS : -arcturus_set_ppt_funcs (smu); -break ; -case CHIP_NAVI10 : -case CHIP_NAVI14 : -case CHIP_NAVI12 : -navi10_set_ppt_funcs (smu); -break ; -default : -pr_warn ("Unknown asic for smu11\n" ); - } -}drivers/gpu/drm/amd/powerplay/smu_v12_0.c +18
-52@@ -30,7 +30,6 @@#include "smu_v12_0.h" #include "soc15_common.h" #include "atom.h" -#include "renoir_ppt.h" #include "asic_reg/mp/mp_12_0_0_offset.h" #include "asic_reg/mp/mp_12_0_0_sh_mask.h" @@ -42,7 +41,7 @@#define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS_MASK 0x00000006L#define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS__SHIFT 0x1 -static int smu_v12_0_send_msg_without_waiting (struct smu_context *smu, +int smu_v12_0_send_msg_without_waiting (struct smu_context *smu,uint16_t msg) {struct amdgpu_device *adev = smu->adev;@@ -51,7 +50,7 @@ static int smu_v12_0_send_msg_without_waiting(struct smu_context *smu,return 0 ; } -static int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg) +int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg) {struct amdgpu_device *adev = smu->adev;@@ -59,7 +58,7 @@ static int smu_v12_0_read_arg(struct smu_context *smu, uint32_t *arg)return 0 ; } -static int smu_v12_0_wait_for_response (struct smu_context *smu) +int smu_v12_0_wait_for_response (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;uint32_t cur_value, i;@@ -78,7 +77,7 @@ static int smu_v12_0_wait_for_response(struct smu_context *smu)return RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90) ==0x1 ?0 : -EIO ; } -static int smu_v12_0_send_msg (struct smu_context *smu,uint16_t msg) +int smu_v12_0_send_msg (struct smu_context *smu,uint16_t msg) {struct amdgpu_device *adev = smu->adev;int ret =0 , index =0 ;@@ -103,7 +102,7 @@ static int smu_v12_0_send_msg(struct smu_context *smu, uint16_t msg) } -static int +int smu_v12_0_send_msg_with_param (struct smu_context *smu,uint16_t msg,uint32_t param) {@@ -133,7 +132,7 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu, uint16_t msg,return ret; } -static int smu_v12_0_check_fw_status (struct smu_context *smu) +int smu_v12_0_check_fw_status (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;uint32_t mp1_fw_flags;@@ -148,7 +147,7 @@ static int smu_v12_0_check_fw_status(struct smu_context *smu)return -EIO ; } -static int smu_v12_0_check_fw_version (struct smu_context *smu) +int smu_v12_0_check_fw_version (struct smu_context *smu) {uint32_t if_version =0xff , smu_version =0xff ;uint16_t smu_major;@@ -182,7 +181,7 @@ static int smu_v12_0_check_fw_version(struct smu_context *smu)return ret; } -static int smu_v12_0_powergate_sdma (struct smu_context *smu,bool gate) +int smu_v12_0_powergate_sdma (struct smu_context *smu,bool gate) {if (!(smu->adev->flags &AMD_IS_APU ))return 0 ;@@ -193,7 +192,7 @@ static int smu_v12_0_powergate_sdma(struct smu_context *smu, bool gate)return smu_send_smc_msg (smu, SMU_MSG_PowerUpSdma); } -static int smu_v12_0_powergate_vcn (struct smu_context *smu,bool gate) +int smu_v12_0_powergate_vcn (struct smu_context *smu,bool gate) {if (!(smu->adev->flags &AMD_IS_APU ))return 0 ;@@ -204,7 +203,7 @@ static int smu_v12_0_powergate_vcn(struct smu_context *smu, bool gate)return smu_send_smc_msg (smu, SMU_MSG_PowerUpVcn); } -static int smu_v12_0_set_gfx_cgpg (struct smu_context *smu,bool enable) +int smu_v12_0_set_gfx_cgpg (struct smu_context *smu,bool enable) {if (!(smu->adev->pg_flags &AMD_PG_SUPPORT_GFX_PG ))return 0 ;@@ -225,7 +224,7 @@ static int smu_v12_0_set_gfx_cgpg(struct smu_context *smu, bool enable)* Returns 2=Not in GFXOFF. * Returns 3=Transition into GFXOFF. */ -static uint32_t smu_v12_0_get_gfxoff_status (struct smu_context *smu) +uint32_t smu_v12_0_get_gfxoff_status (struct smu_context *smu) {uint32_t reg;uint32_t gfxOff_Status =0 ;@@ -238,7 +237,7 @@ static uint32_t smu_v12_0_get_gfxoff_status(struct smu_context *smu)return gfxOff_Status; } -static int smu_v12_0_gfx_off_control (struct smu_context *smu,bool enable) +int smu_v12_0_gfx_off_control (struct smu_context *smu,bool enable) {int ret =0 , timeout =500 ;@@ -271,7 +270,7 @@ static int smu_v12_0_gfx_off_control(struct smu_context *smu, bool enable)return ret; } -static int smu_v12_0_init_smc_tables (struct smu_context *smu) +int smu_v12_0_init_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *tables =NULL ;@@ -289,7 +288,7 @@ static int smu_v12_0_init_smc_tables(struct smu_context *smu)return smu_tables_init (smu, tables); } -static int smu_v12_0_fini_smc_tables (struct smu_context *smu) +int smu_v12_0_fini_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;@@ -305,7 +304,7 @@ static int smu_v12_0_fini_smc_tables(struct smu_context *smu)return 0 ; } -static int smu_v12_0_populate_smc_tables (struct smu_context *smu) +int smu_v12_0_populate_smc_tables (struct smu_context *smu) {struct smu_table_context *smu_table = &smu->smu_table;struct smu_table *table =NULL ;@@ -320,7 +319,7 @@ static int smu_v12_0_populate_smc_tables(struct smu_context *smu)return smu_update_table (smu,SMU_TABLE_DPMCLOCKS ,0 , smu_table->clocks_table, false); } -static int smu_v12_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type, +int smu_v12_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max) {int ret =0 ;@@ -398,11 +397,11 @@ static int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clkreturn ret; } -static int smu_v12_0_mode2_reset (struct smu_context *smu){ +int smu_v12_0_mode2_reset (struct smu_context *smu){return smu_v12_0_send_msg_with_param (smu, SMU_MSG_GfxDeviceDriverReset,SMU_RESET_MODE_2 ); } -static int smu_v12_0_set_soft_freq_limited_range (struct smu_context *smu,enum smu_clk_type clk_type, +int smu_v12_0_set_soft_freq_limited_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max) {int ret =0 ;@@ -455,36 +454,3 @@ static int smu_v12_0_set_soft_freq_limited_range(struct smu_context *smu, enum sreturn ret; } - -static const struct smu_funcs smu_v12_0_funcs = { - .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 smu_v12_0_set_smu_funcs (struct smu_context *smu) -{ -struct amdgpu_device *adev = smu->adev; - - smu->funcs = &smu_v12_0_funcs; - -switch (adev->asic_type) { -case CHIP_RENOIR : -renoir_set_ppt_funcs (smu); -break ; -default : -pr_warn ("Unknown asic for smu12\n" ); - } -}drivers/gpu/drm/amd/powerplay/vega20_ppt.c +54
-4@@ -2248,7 +2248,7 @@ vega20_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->funcs->display_clock_voltage_request (smu, &clock_req)) { +if (!smu_v11_0_display_clock_voltage_request (smu, &clock_req)) {if (smu_feature_is_supported (smu,SMU_FEATURE_DS_DCEFCLK_BIT )) { ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetMinDeepSleepDcefclk,@@ -3031,7 +3031,7 @@ static int vega20_read_sensor(struct smu_context *smu, *size =4 ;break ;default : - ret =smu_smc_read_sensor (smu, sensor, data, size); + ret =smu_v11_0_read_sensor (smu, sensor, data, size); }mutex_unlock (&smu->sensor_lock);@@ -3212,7 +3212,58 @@ static const struct pptable_funcs vega20_ppt_funcs = { .set_watermarks_table = vega20_set_watermarks_table, .get_thermal_temperature_range = vega20_get_thermal_temperature_range, .set_df_cstate = vega20_set_df_cstate, - .update_pcie_parameters = vega20_update_pcie_parameters + .update_pcie_parameters = vega20_update_pcie_parameters, + .init_microcode = smu_v11_0_init_microcode, + .load_microcode = smu_v11_0_load_microcode, + .init_smc_tables = smu_v11_0_init_smc_tables, + .fini_smc_tables = smu_v11_0_fini_smc_tables, + .init_power = smu_v11_0_init_power, + .fini_power = smu_v11_0_fini_power, + .check_fw_status = smu_v11_0_check_fw_status, + .setup_pptable = smu_v11_0_setup_pptable, + .get_vbios_bootup_values = smu_v11_0_get_vbios_bootup_values, + .get_clk_info_from_vbios = smu_v11_0_get_clk_info_from_vbios, + .check_pptable = smu_v11_0_check_pptable, + .parse_pptable = smu_v11_0_parse_pptable, + .populate_smc_tables = smu_v11_0_populate_smc_pptable, + .check_fw_version = smu_v11_0_check_fw_version, + .write_pptable = smu_v11_0_write_pptable, + .set_min_dcef_deep_sleep = smu_v11_0_set_min_dcef_deep_sleep, + .set_tool_table_location = smu_v11_0_set_tool_table_location, + .notify_memory_pool_location = smu_v11_0_notify_memory_pool_location, + .write_watermarks_table = smu_v11_0_write_watermarks_table, + .system_features_control = smu_v11_0_system_features_control, + .send_smc_msg = smu_v11_0_send_msg, + .send_smc_msg_with_param = smu_v11_0_send_msg_with_param, + .read_smc_arg = smu_v11_0_read_arg, + .init_display_count = smu_v11_0_init_display_count, + .set_allowed_mask = smu_v11_0_set_allowed_mask, + .get_enabled_mask = smu_v11_0_get_enabled_mask, + .notify_display_change = smu_v11_0_notify_display_change, + .set_power_limit = smu_v11_0_set_power_limit, + .get_current_clk_freq = smu_v11_0_get_current_clk_freq, + .init_max_sustainable_clocks = smu_v11_0_init_max_sustainable_clocks, + .start_thermal_control = smu_v11_0_start_thermal_control, + .stop_thermal_control = smu_v11_0_stop_thermal_control, + .set_deep_sleep_dcefclk = smu_v11_0_set_deep_sleep_dcefclk, + .display_clock_voltage_request = smu_v11_0_display_clock_voltage_request, + .set_watermarks_for_clock_ranges = smu_v11_0_set_watermarks_for_clock_ranges, + .get_fan_control_mode = smu_v11_0_get_fan_control_mode, + .set_fan_control_mode = smu_v11_0_set_fan_control_mode, + .set_fan_speed_percent = smu_v11_0_set_fan_speed_percent, + .set_fan_speed_rpm = smu_v11_0_set_fan_speed_rpm, + .set_xgmi_pstate = smu_v11_0_set_xgmi_pstate, + .gfx_off_control = smu_v11_0_gfx_off_control, + .register_irq_handler = smu_v11_0_register_irq_handler, + .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme, + .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc, + .baco_is_support= smu_v11_0_baco_is_support, + .baco_get_state = smu_v11_0_baco_get_state, + .baco_set_state = smu_v11_0_baco_set_state, + .baco_reset = smu_v11_0_baco_reset, + .get_dpm_ultimate_freq = smu_v11_0_get_dpm_ultimate_freq, + .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, + .override_pcie_parameters = smu_v11_0_override_pcie_parameters, };void vega20_set_ppt_funcs (struct smu_context *smu) --2.23.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Xu, Feifei
Acked-by Feifei XuThanks,
Feifei
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Quan, Evan
Sent: Friday, October 18, 2019 10:57 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Grodzovsky, Andrey <[email protected]>; Quan, Evan <[email protected]>
Subject: [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 · 10 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx