drm/amd/powerplay: put setting hard limit common code in smu_v11_0.c
Subsystems (2)
PATCH 1/4 drm/amd/powerplay: put setting hard limit common code in smu_v11_0.c
As designed the common code shared among all smu v11 ASCIs go to smu_v11_0.c. This helps to maintain clear code layers.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 36 ----------------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 - drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 5 +++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 12 +++--- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 8 ++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 39 ++++++++++++++++++- 6 files changed, 53 insertions(+), 49 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -36
@@ -255,42 +255,6 @@ int smu_set_soft_freq_range(struct smu_context *smu, enum smu_clk_type clk_type,return ret; } -int smu_set_hard_freq_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t min,uint32_t max) -{ -int ret =0 , clk_id =0 ; -uint32_t param; - -if (min <=0 && max <=0 ) -return -EINVAL ; - -if (!smu_clk_dpm_is_enabled (smu, clk_type)) -return 0 ; - - clk_id =smu_clk_get_index (smu, clk_type); -if (clk_id <0 ) -return clk_id; - -if (max >0 ) { - param = (uint32_t )((clk_id <<16 ) | (max &0xffff )); - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMaxByFreq, - param,NULL ); -if (ret) -return ret; - } - -if (min >0 ) { - param = (uint32_t )((clk_id <<16 ) | (min &0xffff )); - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinByFreq, - param,NULL ); -if (ret) -return ret; - } - - -return ret; -} -int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max,bool lock_needed) {
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -2
@@ -723,8 +723,6 @@ int smu_get_dpm_freq_range(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t *min, uint32_t *max, bool lock_needed);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max,bool lock_needed); -int smu_set_hard_freq_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t min,uint32_t max);int smu_get_dpm_level_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min_value,uint32_t *max_value);enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +5 -0
@@ -252,6 +252,11 @@ int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type cint 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_set_hard_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); int smu_v11_0_set_performance_level(struct smu_context *smu,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +6 -6
@@ -1146,7 +1146,7 @@ static int navi10_pre_display_config_changed(struct smu_context *smu) 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); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK ,0 , max_freq);if (ret)return ret; }
@@ -1549,7 +1549,7 @@ static int navi10_notify_smc_display_config(struct smu_context *smu) }if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { - ret =smu_set_hard_freq_range (smu,SMU_UCLK , min_clocks.memory_clock/100 ,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , min_clocks.memory_clock/100 ,0 );if (ret) {dev_err (smu->adev->dev,"[%s] Set hard min uclk failed!" , __func__);return ret;
@@ -1921,9 +1921,9 @@ static int navi10_display_disable_memory_clock_switch(struct smu_context *smu,return 0 ;if (disable_memory_clock_switch) - ret =smu_set_hard_freq_range (smu,SMU_UCLK , max_memory_clock,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , max_memory_clock,0 );else - ret =smu_set_hard_freq_range (smu,SMU_UCLK , min_memory_clock,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , min_memory_clock,0 );if (!ret) smu->disable_uclk_switch = disable_memory_clock_switch;
@@ -2344,12 +2344,12 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu)return ret;/* Force UCLK out of the highest DPM */ - ret =smu_set_hard_freq_range (smu,SMU_UCLK ,0 , uclk_min); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK ,0 , uclk_min);if (ret)return ret;/* Revert the UCLK Hardmax */ - ret =smu_set_hard_freq_range (smu,SMU_UCLK ,0 , uclk_max); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK ,0 , uclk_max);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +4 -4
@@ -945,7 +945,7 @@ static int sienna_cichlid_pre_display_config_changed(struct smu_context *smu) 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); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK ,0 , max_freq);if (ret)return ret; }
@@ -1353,7 +1353,7 @@ static int sienna_cichlid_notify_smc_display_config(struct smu_context *smu) }if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { - ret =smu_set_hard_freq_range (smu,SMU_UCLK , min_clocks.memory_clock/100 ,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , min_clocks.memory_clock/100 ,0 );if (ret) {dev_err (smu->adev->dev,"[%s] Set hard min uclk failed!" , __func__);return ret;
@@ -1657,9 +1657,9 @@ static int sienna_cichlid_display_disable_memory_clock_switch(struct smu_contextreturn 0 ;if (disable_memory_clock_switch) - ret =smu_set_hard_freq_range (smu,SMU_UCLK , max_memory_clock,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , max_memory_clock,0 );else - ret =smu_set_hard_freq_range (smu,SMU_UCLK , min_memory_clock,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK , min_memory_clock,0 );if (!ret) smu->disable_uclk_switch = disable_memory_clock_switch;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +38 -1
@@ -1192,7 +1192,7 @@ smu_v11_0_display_clock_voltage_request(struct smu_context *smu,if (clk_select ==SMU_UCLK && smu->disable_uclk_switch)return 0 ; - ret =smu_set_hard_freq_range (smu, clk_select, clk_freq,0 ); + ret =smu_v11_0_set_hard_freq_limited_range (smu, clk_select, clk_freq,0 );if (clk_select ==SMU_UCLK ) smu->hard_min_uclk_req_from_dal = clk_freq;
@@ -1746,6 +1746,43 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_return ret; } +int smu_v11_0_set_hard_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 ; +uint32_t param; + +if (min <=0 && max <=0 ) +return -EINVAL ; + +if (!smu_clk_dpm_is_enabled (smu, clk_type)) +return 0 ; + + clk_id =smu_clk_get_index (smu, clk_type); +if (clk_id <0 ) +return clk_id; + +if (max >0 ) { + param = (uint32_t )((clk_id <<16 ) | (max &0xffff )); + ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMaxByFreq, + param,NULL ); +if (ret) +return ret; + } + +if (min >0 ) { + param = (uint32_t )((clk_id <<16 ) | (min &0xffff )); + ret =smu_send_smc_msg_with_param (smu, SMU_MSG_SetHardMinByFreq, + param,NULL ); +if (ret) +return ret; + } + +return ret; +} +int smu_v11_0_override_pcie_parameters (struct smu_context *smu) {struct amdgpu_device *adev = smu->adev;
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/4 drm/amd/powerplay: revise calling chain on setting soft limit
This helps to maintain clear code layers and drop unnecessary parameter.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 4 +- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 20 +++++---- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 14 +++---- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 8 ++-- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 42 +++++++++---------- 6 files changed, 49 insertions(+), 41 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +3 -1
@@ -1464,7 +1464,9 @@ static int amdgpu_debugfs_sclk_set(void *data, u64 val) ret =smu_get_dpm_freq_range (&adev->smu,SMU_SCLK , &min_freq, &max_freq, true);if (ret || val > max_freq || val < min_freq)return -EINVAL ; - ret =smu_set_soft_freq_range (&adev->smu,SMU_SCLK , (uint32_t )val, (uint32_t )val, true); + ret =smu_set_soft_freq_range (&adev->smu,SMU_SCLK , (uint32_t )val, (uint32_t )val); + }else { +return 0 ; }pm_runtime_mark_last_busy (adev->ddev->dev);
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +13 -7
@@ -238,19 +238,25 @@ int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_treturn ret; } -int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t min,uint32_t max,bool lock_needed) +int smu_set_soft_freq_range (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t min, +uint32_t max) {int ret =0 ;if (!smu_clk_dpm_is_enabled (smu, clk_type))return 0 ; -if (lock_needed) -mutex_lock (&smu->mutex); - ret =smu_set_soft_freq_limited_range (smu, clk_type, min, max); -if (lock_needed) -mutex_unlock (&smu->mutex); +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->set_soft_freq_limited_range) + ret = smu->ppt_funcs->set_soft_freq_limited_range (smu, + clk_type, + min, + max); + +mutex_unlock (&smu->mutex);return ret; }
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -1
@@ -722,7 +722,7 @@ int smu_get_dpm_level_count(struct smu_context *smu, enum smu_clk_type clk_type,int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max,bool lock_needed);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t min,uint32_t max,bool lock_needed); +uint32_t min,uint32_t max);int smu_get_dpm_level_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min_value,uint32_t *max_value);enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +7 -7
@@ -1066,7 +1066,7 @@ static int navi10_force_clk_levels(struct smu_context *smu,if (ret)return size; - ret =smu_set_soft_freq_range (smu, clk_type, min_freq, max_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu, clk_type, min_freq, max_freq);if (ret)return size;break ;
@@ -1190,7 +1190,7 @@ static int navi10_force_dpm_limit_value(struct smu_context *smu, bool highest)return ret; force_freq = highest ? max_freq : min_freq; - ret =smu_set_soft_freq_range (smu, clk_type, force_freq, force_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu, clk_type, force_freq, force_freq);if (ret)return ret; }
@@ -1216,7 +1216,7 @@ static int navi10_unforce_dpm_levels(struct smu_context *smu)if (ret)return ret; - ret =smu_set_soft_freq_range (smu, clk_type, min_freq, max_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu, clk_type, min_freq, max_freq);if (ret)return ret; }
@@ -1772,10 +1772,10 @@ static int navi10_set_standard_performance_level(struct smu_context *smu)return navi10_set_performance_level (smu,AMD_DPM_FORCED_LEVEL_AUTO ); } - ret =smu_set_soft_freq_range (smu,SMU_SCLK , sclk_freq, sclk_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu,SMU_SCLK , sclk_freq, sclk_freq);if (ret)return ret; - ret =smu_set_soft_freq_range (smu,SMU_UCLK , uclk_freq, uclk_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu,SMU_UCLK , uclk_freq, uclk_freq);if (ret)return ret;
@@ -1840,10 +1840,10 @@ static int navi10_set_peak_performance_level(struct smu_context *smu)if (ret)return ret; - ret =smu_set_soft_freq_range (smu,SMU_SCLK , sclk_freq, sclk_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu,SMU_SCLK , sclk_freq, sclk_freq);if (ret)return ret; - ret =smu_set_soft_freq_range (smu,SMU_UCLK , uclk_freq, uclk_freq, false); + ret =smu_v11_0_set_soft_freq_limited_range (smu,SMU_UCLK , uclk_freq, uclk_freq);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +4 -4
@@ -439,7 +439,7 @@ static int renoir_force_dpm_limit_value(struct smu_context *smu, bool highest)return ret; force_freq = highest ? max_freq : min_freq; - ret =smu_set_soft_freq_range (smu, clk_type, force_freq, force_freq, false); + ret =smu_v12_0_set_soft_freq_limited_range (smu, clk_type, force_freq, force_freq);if (ret)return ret; }
@@ -472,7 +472,7 @@ static int renoir_unforce_dpm_levels(struct smu_context *smu) {if (ret)return ret; - ret =smu_set_soft_freq_range (smu, clk_type, min_freq, max_freq, false); + ret =smu_v12_0_set_soft_freq_limited_range (smu, clk_type, min_freq, max_freq);if (ret)return ret; }
@@ -720,7 +720,7 @@ static int renoir_set_peak_clock_by_device(struct smu_context *smu)if (ret)return ret; - ret =smu_set_soft_freq_range (smu,SMU_SCLK , sclk_freq, sclk_freq, false); + ret =smu_v12_0_set_soft_freq_limited_range (smu,SMU_SCLK , sclk_freq, sclk_freq);if (ret)return ret;
@@ -728,7 +728,7 @@ static int renoir_set_peak_clock_by_device(struct smu_context *smu)if (ret)return ret; - ret =smu_set_soft_freq_range (smu,SMU_UCLK , uclk_freq, uclk_freq, false); + ret =smu_v12_0_set_soft_freq_limited_range (smu,SMU_UCLK , uclk_freq, uclk_freq);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +21 -21
80 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amd/powerplay: revise calling chain on retrieving frequency range
In reply to Evan QuanThis helps to maintain clear code layers and drop unnecessary parameter.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 6 +-- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 48 +++++-------------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 10 ++-- drivers/gpu/drm/amd/powerplay/renoir_ppt.c | 12 ++--- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 10 ++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 28 +++++++++++ drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 28 +++++++++++ 9 files changed, 87 insertions(+), 59 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +1 -1
@@ -1461,7 +1461,7 @@ static int amdgpu_debugfs_sclk_set(void *data, u64 val) }if (is_support_sw_smu (adev)) { - ret =smu_get_dpm_freq_range (&adev->smu,SMU_SCLK , &min_freq, &max_freq, true); + ret =smu_get_dpm_freq_range (&adev->smu,SMU_SCLK , &min_freq, &max_freq);if (ret || val > max_freq || val < min_freq)return -EINVAL ; ret =smu_set_soft_freq_range (&adev->smu,SMU_SCLK , (uint32_t )val, (uint32_t )val);
drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c +2 -4
@@ -911,8 +911,7 @@ 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 , - true); + !low ? &clk_freq :NULL );if (ret)return 0 ;return clk_freq *100 ;
@@ -929,8 +928,7 @@ 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 , - true); + !low ? &clk_freq :NULL );if (ret)return 0 ;return clk_freq *100 ;
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +11 -37
62 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -1
@@ -720,7 +720,7 @@ int smu_get_dpm_freq_by_index(struct smu_context *smu, enum smu_clk_type clk_typint smu_get_dpm_level_count (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *value);int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *min,uint32_t *max,bool lock_needed); +uint32_t *min,uint32_t *max);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max); int smu_get_dpm_level_range(struct smu_context *smu, enum smu_clk_type clk_type,
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +5 -5
@@ -1082,13 +1082,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 , false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_SCLK , &min_sclk_freq,NULL );if (ret)return ret; smu->pstate_sclk = min_sclk_freq *100 ; - ret =smu_get_dpm_freq_range (smu,SMU_MCLK , &min_mclk_freq,NULL , false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_MCLK , &min_mclk_freq,NULL );if (ret)return ret;
@@ -1143,7 +1143,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, false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_UCLK ,NULL , &max_freq);if (ret)return ret; ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK ,0 , max_freq);
@@ -1185,7 +1185,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, false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu, clk_type, &min_freq, &max_freq);if (ret)return ret;
@@ -1212,7 +1212,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, false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu, clk_type, &min_freq, &max_freq);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/renoir_ppt.c +6 -6
@@ -264,7 +264,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, false); + ret =smu_v12_0_get_dpm_ultimate_freq (smu,SMU_GFXCLK , &min, &max);if (!ret) {/* driver only know min/max gfx_clk, Add level 1 for all other gfx clks */ if (cur_value == max)
@@ -434,7 +434,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, false); + ret =smu_v12_0_get_dpm_ultimate_freq (smu, clk_type, &min_freq, &max_freq);if (ret)return ret;
@@ -468,7 +468,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, false); + ret =smu_v12_0_get_dpm_ultimate_freq (smu, clk_type, &min_freq, &max_freq);if (ret)return ret;
@@ -633,7 +633,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, false); + ret =smu_v12_0_get_dpm_ultimate_freq (smu,SMU_GFXCLK , &min_freq, &max_freq);if (ret)return ret; ret = smu_send_smc_msg_with_param(smu, SMU_MSG_SetSoftMaxGfxClk,
@@ -716,7 +716,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, false); + ret =smu_v12_0_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &sclk_freq);if (ret)return ret;
@@ -724,7 +724,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, false); + ret =smu_v12_0_get_dpm_ultimate_freq (smu,SMU_UCLK ,NULL , &uclk_freq);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +5 -5
@@ -929,13 +929,13 @@ static int sienna_cichlid_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 , false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_SCLK , &min_sclk_freq,NULL );if (ret)return ret; smu->pstate_sclk = min_sclk_freq *100 ; - ret =smu_get_dpm_freq_range (smu,SMU_MCLK , &min_mclk_freq,NULL , false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_MCLK , &min_mclk_freq,NULL );if (ret)return ret;
@@ -958,7 +958,7 @@ static int sienna_cichlid_pre_display_config_changed(struct smu_context *smu)#endif if (smu_feature_is_enabled (smu,SMU_FEATURE_DPM_UCLK_BIT )) { - ret =smu_get_dpm_freq_range (smu,SMU_UCLK ,NULL , &max_freq, false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu,SMU_UCLK ,NULL , &max_freq);if (ret)return ret; ret =smu_v11_0_set_hard_freq_limited_range (smu,SMU_UCLK ,0 , max_freq);
@@ -1002,7 +1002,7 @@ static int sienna_cichlid_force_dpm_limit_value(struct smu_context *smu, bool hifor (i =0 ; i <ARRAY_SIZE (clks); i++) { clk_type = clks[i]; - ret =smu_get_dpm_freq_range (smu, clk_type, &min_freq, &max_freq, false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu, clk_type, &min_freq, &max_freq);if (ret)return ret;
@@ -1029,7 +1029,7 @@ static int sienna_cichlid_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, false); + ret =smu_v11_0_get_dpm_ultimate_freq (smu, clk_type, &min_freq, &max_freq);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +28 -0
@@ -1693,6 +1693,34 @@ int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type c {int ret =0 , clk_id =0 ;uint32_t param =0 ; +uint32_t clock_limit; + +if (!smu_clk_dpm_is_enabled (smu, clk_type)) { +switch (clk_type) { +case SMU_MCLK : +case SMU_UCLK : + clock_limit = smu->smu_table.boot_values.uclk; +break ; +case SMU_GFXCLK : +case SMU_SCLK : + clock_limit = smu->smu_table.boot_values.gfxclk; +break ; +case SMU_SOCCLK : + clock_limit = smu->smu_table.boot_values.socclk; +break ; +default : + clock_limit =0 ; +break ; + } + +/* clock in Mhz unit */ +if (min) + *min = clock_limit /100 ; +if (max) + *max = clock_limit /100 ; + +return 0 ; + } clk_id =smu_clk_get_index (smu, clk_type);if (clk_id <0 ) {
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +28 -0
@@ -321,6 +321,34 @@ int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type c {int ret =0 ;uint32_t mclk_mask, soc_mask; +uint32_t clock_limit; + +if (!smu_clk_dpm_is_enabled (smu, clk_type)) { +switch (clk_type) { +case SMU_MCLK : +case SMU_UCLK : + clock_limit = smu->smu_table.boot_values.uclk; +break ; +case SMU_GFXCLK : +case SMU_SCLK : + clock_limit = smu->smu_table.boot_values.gfxclk; +break ; +case SMU_SOCCLK : + clock_limit = smu->smu_table.boot_values.socclk; +break ; +default : + clock_limit =0 ; +break ; + } + +/* clock in Mhz unit */ +if (min) + *min = clock_limit /100 ; +if (max) + *max = clock_limit /100 ; + +return 0 ; + }if (max) { ret = smu_get_profiling_clk_mask(smu, AMD_DPM_FORCED_LEVEL_PROFILE_PEAK,
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amd/powerplay: put dpm frequency setting common code in smu_v11_0.c
In reply to Evan QuanAs designed the common code shared among all smu v11 ASCIs go to smu_v11_0.c. This helps to maintain clear code layers.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 65 -------------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 6 -- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 14 ++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 38 +++++---- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 18 ++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 84 +++++++++++++++++++ 6 files changed, 129 insertions(+), 96 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0 -65
@@ -284,71 +284,6 @@ int smu_get_dpm_freq_range(struct smu_context *smu,return ret; } -int smu_get_dpm_freq_by_index (struct smu_context *smu,enum smu_clk_type clk_type, -uint16_t level,uint32_t *value) -{ -int ret =0 , clk_id =0 ; -uint32_t param; - -if (!value) -return -EINVAL ; - -if (!smu_clk_dpm_is_enabled (smu, clk_type)) -return 0 ; - - clk_id =smu_clk_get_index (smu, clk_type); -if (clk_id <0 ) -return clk_id; - - param = (uint32_t )(((clk_id &0xffff ) <<16 ) | (level &0xffff )); - - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetDpmFreqByIndex, - param, value); -if (ret) -return ret; - -/* BIT31: 0 - Fine grained DPM, 1 - Dicrete DPM -* now, we un-support it */ - *value = *value &0x7fffffff ; - -return ret; -} - -int smu_get_dpm_level_count (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *value) -{ -return smu_get_dpm_freq_by_index (smu, clk_type,0xff , value); -} - -int smu_get_dpm_level_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *min_value,uint32_t *max_value) -{ -int ret =0 ; -uint32_t level_count =0 ; - -if (!min_value && !max_value) -return -EINVAL ; - -if (min_value) { -/* by default, level 0 clock value as min value */ - ret =smu_get_dpm_freq_by_index (smu, clk_type,0 , min_value); -if (ret) -return ret; - } - -if (max_value) { - ret =smu_get_dpm_level_count (smu, clk_type, &level_count); -if (ret) -return ret; - - ret =smu_get_dpm_freq_by_index (smu, clk_type, level_count -1 , max_value); -if (ret) -return ret; - } - -return ret; -} -bool smu_clk_dpm_is_enabled (struct smu_context *smu,enum smu_clk_type clk_type) {enum smu_feature_mask feature_id =0 ;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0 -6
@@ -715,16 +715,10 @@ int smu_switch_power_profile(struct smu_context *smu,enum PP_SMC_POWER_PROFILE type, bool en);int smu_get_smc_version (struct smu_context *smu,uint32_t *if_version,uint32_t *smu_version); -int smu_get_dpm_freq_by_index (struct smu_context *smu,enum smu_clk_type clk_type, -uint16_t level,uint32_t *value); -int smu_get_dpm_level_count (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *value);int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max); -int smu_get_dpm_level_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *min_value,uint32_t *max_value);enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +14 -0
@@ -265,4 +265,18 @@ int smu_v11_0_set_performance_level(struct smu_context *smu,int smu_v11_0_set_power_source (struct smu_context *smu,enum smu_power_src_type power_src); +int smu_v11_0_get_dpm_freq_by_index (struct smu_context *smu, +enum smu_clk_type clk_type, +uint16_t level, +uint32_t *value); + +int smu_v11_0_get_dpm_level_count (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *value); + +int smu_v11_0_get_dpm_level_range (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *min_value, +uint32_t *max_value); +#endif
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +22 -16
@@ -881,13 +881,13 @@ static int navi10_print_clk_levels(struct smu_context *smu,if (ret)return size; - ret =smu_get_dpm_level_count (smu, clk_type, &count); + ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &count);if (ret)return size;if (!navi10_is_support_fine_grained_dpm (smu, clk_type)) {for (i =0 ; i < count; i++) { - ret =smu_get_dpm_freq_by_index (smu, clk_type, i, &value); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, i, &value);if (ret)return size;
@@ -895,10 +895,10 @@ static int navi10_print_clk_levels(struct smu_context *smu, cur_value == value ? "*" : ""); } }else { - ret =smu_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]);if (ret)return size; - ret =smu_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]);if (ret)return size;
@@ -1058,11 +1058,11 @@ static int navi10_force_clk_levels(struct smu_context *smu, soft_min_level = (soft_min_level >=1 ?1 :0 ); } - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq);if (ret)return size; - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq);if (ret)return size;
@@ -1110,7 +1110,7 @@ static int navi10_get_clock_by_type_with_latency(struct smu_context *smu,case SMU_SOCCLK :case SMU_MCLK :case SMU_UCLK : - ret =smu_get_dpm_level_count (smu, clk_type, &level_count); + ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &level_count);if (ret)return ret;
@@ -1118,7 +1118,7 @@ static int navi10_get_clock_by_type_with_latency(struct smu_context *smu, clocks->num_levels = level_count;for (i =0 ; i < level_count; i++) { - ret =smu_get_dpm_freq_by_index (smu, clk_type, i, &freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, i, &freq);if (ret)return ret;
@@ -1493,21 +1493,21 @@ static int navi10_get_profiling_clk_mask(struct smu_context *smu, *mclk_mask =0 ; }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) {if (sclk_mask) { - ret =smu_get_dpm_level_count (smu,SMU_SCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SCLK , &level_count);if (ret)return ret; *sclk_mask = level_count -1 ; }if (mclk_mask) { - ret =smu_get_dpm_level_count (smu,SMU_MCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_MCLK , &level_count);if (ret)return ret; *mclk_mask = level_count -1 ; }if (soc_mask) { - ret =smu_get_dpm_level_count (smu,SMU_SOCCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SOCCLK , &level_count);if (ret)return ret; *soc_mask = level_count -1 ;
@@ -1831,12 +1831,18 @@ static int navi10_set_peak_performance_level(struct smu_context *smu) sclk_freq =NAVI12_UMD_PSTATE_PEAK_GFXCLK ;break ;default : - ret =smu_get_dpm_level_range (smu,SMU_SCLK ,NULL , &sclk_freq); + ret =smu_v11_0_get_dpm_level_range (smu, +SMU_SCLK , +NULL , + &sclk_freq);if (ret)return ret; } - ret =smu_get_dpm_level_range (smu,SMU_UCLK ,NULL , &uclk_freq); + ret =smu_v11_0_get_dpm_level_range (smu, +SMU_UCLK , +NULL , + &uclk_freq);if (ret)return ret;
@@ -2331,15 +2337,15 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu)if (smu_version <0x2A3200 )return 0 ; - ret =smu_get_dpm_level_count (smu,SMU_UCLK , &uclk_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_UCLK , &uclk_count);if (ret)return ret; - ret =smu_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )0 , &uclk_min); + ret =smu_v11_0_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )0 , &uclk_min);if (ret)return ret; - ret =smu_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )(uclk_count -1 ), &uclk_max); + ret =smu_v11_0_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )(uclk_count -1 ), &uclk_max);if (ret)return ret;
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +9 -9
@@ -789,13 +789,13 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,if ((clk_type ==SMU_GFXCLK ) || (clk_type ==SMU_SCLK ))amdgpu_gfx_off_ctrl (adev, false); - ret =smu_get_dpm_level_count (smu, clk_type, &count); + ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &count);if (ret) goto print_clk_out;if (!sienna_cichlid_is_support_fine_grained_dpm (smu, clk_type)) {for (i =0 ; i < count; i++) { - ret =smu_get_dpm_freq_by_index (smu, clk_type, i, &value); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, i, &value);if (ret) goto print_clk_out;
@@ -803,10 +803,10 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu, cur_value == value ? "*" : ""); } }else { - ret =smu_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]);if (ret) goto print_clk_out; - ret =smu_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]);if (ret) goto print_clk_out;
@@ -901,11 +901,11 @@ static int sienna_cichlid_force_clk_levels(struct smu_context *smu, soft_min_level = (soft_min_level >=1 ?1 :0 ); } - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq);if (ret) goto forec_level_out; - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq);if (ret) goto forec_level_out;
@@ -1312,7 +1312,7 @@ static int sienna_cichlid_get_profiling_clk_mask(struct smu_context *smu, }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) {if (sclk_mask) {amdgpu_gfx_off_ctrl (adev, false); - ret =smu_get_dpm_level_count (smu,SMU_SCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SCLK , &level_count);amdgpu_gfx_off_ctrl (adev, true);if (ret)return ret;
@@ -1320,14 +1320,14 @@ static int sienna_cichlid_get_profiling_clk_mask(struct smu_context *smu, }if (mclk_mask) { - ret =smu_get_dpm_level_count (smu,SMU_MCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_MCLK , &level_count);if (ret)return ret; *mclk_mask = level_count -1 ; }if (soc_mask) { - ret =smu_get_dpm_level_count (smu,SMU_SOCCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SOCCLK , &level_count);if (ret)return ret; *soc_mask = level_count -1 ;
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +84 -0
87 lines not on this page · raw message
Signature · 6 lines
2.27.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 4/4] drm/amd/powerplay: put dpm frequency setting common code in smu_v11_0.c
Quoted 6 lines · Evan Quan
As designed the common code shared among all smu v11 ASCIs go to
smu_v11_0.c. This helps to maintain clear code layers.Change-Id I1f848eba0b6b56f8b5ef6f0888ee6955ba1d2070Signed-off-by Evan Quan <[email protected]>
Series is:
Quoted 427 lines
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 65 -------------- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 6 -- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 14 ++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 38 +++++---- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 18 ++-- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 84 +++++++++++++++++++ 6 files changed, 129 insertions(+), 96 deletions(-)drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +0
-65@@ -284,71 +284,6 @@ int smu_get_dpm_freq_range(struct smu_context *smu,return ret; } -int smu_get_dpm_freq_by_index (struct smu_context *smu,enum smu_clk_type clk_type, -uint16_t level,uint32_t *value) -{ -int ret =0 , clk_id =0 ; -uint32_t param; - -if (!value) -return -EINVAL ; - -if (!smu_clk_dpm_is_enabled (smu, clk_type)) -return 0 ; - - clk_id =smu_clk_get_index (smu, clk_type); -if (clk_id <0 ) -return clk_id; - - param = (uint32_t )(((clk_id &0xffff ) <<16 ) | (level &0xffff )); - - ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetDpmFreqByIndex, - param, value); -if (ret) -return ret; - -/* BIT31: 0 - Fine grained DPM, 1 - Dicrete DPM -* now, we un-support it */ - *value = *value &0x7fffffff ; - -return ret; -} - -int smu_get_dpm_level_count (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *value) -{ -return smu_get_dpm_freq_by_index (smu, clk_type,0xff , value); -} - -int smu_get_dpm_level_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *min_value,uint32_t *max_value) -{ -int ret =0 ; -uint32_t level_count =0 ; - -if (!min_value && !max_value) -return -EINVAL ; - -if (min_value) { -/* by default, level 0 clock value as min value */ - ret =smu_get_dpm_freq_by_index (smu, clk_type,0 , min_value); -if (ret) -return ret; - } - -if (max_value) { - ret =smu_get_dpm_level_count (smu, clk_type, &level_count); -if (ret) -return ret; - - ret =smu_get_dpm_freq_by_index (smu, clk_type, level_count -1 , max_value); -if (ret) -return ret; - } - -return ret; -} -bool smu_clk_dpm_is_enabled (struct smu_context *smu,enum smu_clk_type clk_type) {enum smu_feature_mask feature_id =0 ;drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +0
-6@@ -715,16 +715,10 @@ int smu_switch_power_profile(struct smu_context *smu,enum PP_SMC_POWER_PROFILE type, bool en);int smu_get_smc_version (struct smu_context *smu,uint32_t *if_version,uint32_t *smu_version); -int smu_get_dpm_freq_by_index (struct smu_context *smu,enum smu_clk_type clk_type, -uint16_t level,uint32_t *value); -int smu_get_dpm_level_count (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *value);int smu_get_dpm_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);int smu_set_soft_freq_range (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max); -int smu_get_dpm_level_range (struct smu_context *smu,enum smu_clk_type clk_type, -uint32_t *min_value,uint32_t *max_value);enum amd_dpm_forced_level smu_get_performance_level (struct smu_context *smu);int smu_force_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level);int smu_set_display_count (struct smu_context *smu,uint32_t count);drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +14
-0@@ -265,4 +265,18 @@ int smu_v11_0_set_performance_level(struct smu_context *smu,int smu_v11_0_set_power_source (struct smu_context *smu,enum smu_power_src_type power_src); +int smu_v11_0_get_dpm_freq_by_index (struct smu_context *smu, +enum smu_clk_type clk_type, +uint16_t level, +uint32_t *value); + +int smu_v11_0_get_dpm_level_count (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *value); + +int smu_v11_0_get_dpm_level_range (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *min_value, +uint32_t *max_value); +#endif drivers/gpu/drm/amd/powerplay/navi10_ppt.c +22
-16@@ -881,13 +881,13 @@ static int navi10_print_clk_levels(struct smu_context *smu,if (ret)return size; - ret =smu_get_dpm_level_count (smu, clk_type, &count); + ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &count);if (ret)return size;if (!navi10_is_support_fine_grained_dpm (smu, clk_type)) {for (i =0 ; i < count; i++) { - ret =smu_get_dpm_freq_by_index (smu, clk_type, i, &value); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, i, &value);if (ret)return size;@@ -895,10 +895,10 @@ static int navi10_print_clk_levels(struct smu_context *smu, cur_value == value ? "*" : ""); } }else { - ret =smu_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]);if (ret)return size; - ret =smu_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]);if (ret)return size;@@ -1058,11 +1058,11 @@ static int navi10_force_clk_levels(struct smu_context *smu, soft_min_level = (soft_min_level >=1 ?1 :0 ); } - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq);if (ret)return size; - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq);if (ret)return size;@@ -1110,7 +1110,7 @@ static int navi10_get_clock_by_type_with_latency(struct smu_context *smu,case SMU_SOCCLK :case SMU_MCLK :case SMU_UCLK : - ret =smu_get_dpm_level_count (smu, clk_type, &level_count); + ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &level_count);if (ret)return ret;@@ -1118,7 +1118,7 @@ static int navi10_get_clock_by_type_with_latency(struct smu_context *smu, clocks->num_levels = level_count;for (i =0 ; i < level_count; i++) { - ret =smu_get_dpm_freq_by_index (smu, clk_type, i, &freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, i, &freq);if (ret)return ret;@@ -1493,21 +1493,21 @@ static int navi10_get_profiling_clk_mask(struct smu_context *smu, *mclk_mask =0 ; }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) {if (sclk_mask) { - ret =smu_get_dpm_level_count (smu,SMU_SCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SCLK , &level_count);if (ret)return ret; *sclk_mask = level_count -1 ; }if (mclk_mask) { - ret =smu_get_dpm_level_count (smu,SMU_MCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_MCLK , &level_count);if (ret)return ret; *mclk_mask = level_count -1 ; }if (soc_mask) { - ret =smu_get_dpm_level_count (smu,SMU_SOCCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SOCCLK , &level_count);if (ret)return ret; *soc_mask = level_count -1 ;@@ -1831,12 +1831,18 @@ static int navi10_set_peak_performance_level(struct smu_context *smu) sclk_freq =NAVI12_UMD_PSTATE_PEAK_GFXCLK ;break ;default : - ret =smu_get_dpm_level_range (smu,SMU_SCLK ,NULL , &sclk_freq); + ret =smu_v11_0_get_dpm_level_range (smu, +SMU_SCLK , +NULL , + &sclk_freq);if (ret)return ret; } - ret =smu_get_dpm_level_range (smu,SMU_UCLK ,NULL , &uclk_freq); + ret =smu_v11_0_get_dpm_level_range (smu, +SMU_UCLK , +NULL , + &uclk_freq);if (ret)return ret;@@ -2331,15 +2337,15 @@ static int navi10_disable_umc_cdr_12gbps_workaround(struct smu_context *smu)if (smu_version <0x2A3200 )return 0 ; - ret =smu_get_dpm_level_count (smu,SMU_UCLK , &uclk_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_UCLK , &uclk_count);if (ret)return ret; - ret =smu_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )0 , &uclk_min); + ret =smu_v11_0_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )0 , &uclk_min);if (ret)return ret; - ret =smu_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )(uclk_count -1 ), &uclk_max); + ret =smu_v11_0_get_dpm_freq_by_index (smu,SMU_UCLK , (uint16_t )(uclk_count -1 ), &uclk_max);if (ret)return ret;drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +9
-9@@ -789,13 +789,13 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu,if ((clk_type ==SMU_GFXCLK ) || (clk_type ==SMU_SCLK ))amdgpu_gfx_off_ctrl (adev, false); - ret =smu_get_dpm_level_count (smu, clk_type, &count); + ret =smu_v11_0_get_dpm_level_count (smu, clk_type, &count);if (ret) goto print_clk_out;if (!sienna_cichlid_is_support_fine_grained_dpm (smu, clk_type)) {for (i =0 ; i < count; i++) { - ret =smu_get_dpm_freq_by_index (smu, clk_type, i, &value); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, i, &value);if (ret) goto print_clk_out;@@ -803,10 +803,10 @@ static int sienna_cichlid_print_clk_levels(struct smu_context *smu, cur_value == value ? "*" : ""); } }else { - ret =smu_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type,0 , &freq_values[0 ]);if (ret) goto print_clk_out; - ret =smu_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, count -1 , &freq_values[2 ]);if (ret) goto print_clk_out;@@ -901,11 +901,11 @@ static int sienna_cichlid_force_clk_levels(struct smu_context *smu, soft_min_level = (soft_min_level >=1 ?1 :0 ); } - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_min_level, &min_freq);if (ret) goto forec_level_out; - ret =smu_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq); + ret =smu_v11_0_get_dpm_freq_by_index (smu, clk_type, soft_max_level, &max_freq);if (ret) goto forec_level_out;@@ -1312,7 +1312,7 @@ static int sienna_cichlid_get_profiling_clk_mask(struct smu_context *smu, }else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) {if (sclk_mask) {amdgpu_gfx_off_ctrl (adev, false); - ret =smu_get_dpm_level_count (smu,SMU_SCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SCLK , &level_count);amdgpu_gfx_off_ctrl (adev, true);if (ret)return ret;@@ -1320,14 +1320,14 @@ static int sienna_cichlid_get_profiling_clk_mask(struct smu_context *smu, }if (mclk_mask) { - ret =smu_get_dpm_level_count (smu,SMU_MCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_MCLK , &level_count);if (ret)return ret; *mclk_mask = level_count -1 ; }if (soc_mask) { - ret =smu_get_dpm_level_count (smu,SMU_SOCCLK , &level_count); + ret =smu_v11_0_get_dpm_level_count (smu,SMU_SOCCLK , &level_count);if (ret)return ret; *soc_mask = level_count -1 ;drivers/gpu/drm/amd/powerplay/smu_v11_0.c +84
-1@@ -1905,3 +1905,87 @@ int smu_v11_0_set_power_source(struct smu_context *smu, NULL); } +int smu_v11_0_get_dpm_freq_by_index (struct smu_context *smu, +enum smu_clk_type clk_type, +uint16_t level, +uint32_t *value) +{ +int ret =0 , clk_id =0 ; +uint32_t param; + +if (!value) +return -EINVAL ; + +if (!smu_clk_dpm_is_enabled (smu, clk_type)) +return 0 ; + + clk_id =smu_clk_get_index (smu, clk_type); +if (clk_id <0 ) +return clk_id; + + param = (uint32_t )(((clk_id &0xffff ) <<16 ) | (level &0xffff )); + + ret =smu_send_smc_msg_with_param (smu, + SMU_MSG_GetDpmFreqByIndex, + param, + value); +if (ret) +return ret; + +/* +* BIT31: 0 - Fine grained DPM, 1 - Dicrete DPM +* now, we un-support it +*/ + *value = *value &0x7fffffff ; + +return ret; +} + +int smu_v11_0_get_dpm_level_count (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *value) +{ +return smu_v11_0_get_dpm_freq_by_index (smu, + clk_type, +0xff , + value); +} + +int smu_v11_0_get_dpm_level_range (struct smu_context *smu, +enum smu_clk_type clk_type, +uint32_t *min_value, +uint32_t *max_value) +{ +uint32_t level_count =0 ; +int ret =0 ; + +if (!min_value && !max_value) +return -EINVAL ; + +if (min_value) { +/* by default, level 0 clock value as min value */ + ret =smu_v11_0_get_dpm_freq_by_index (smu, + clk_type, +0 , + min_value); +if (ret) +return ret; + } + +if (max_value) { + ret =smu_v11_0_get_dpm_level_count (smu, + clk_type, + &level_count); +if (ret) +return ret; + + ret =smu_v11_0_get_dpm_freq_by_index (smu, + clk_type, + level_count -1 , + max_value); +if (ret) +return ret; + } + +return ret; +} --2.27.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