drm/amd/pm: fix vclk setting failed for SMU v13.0.5
Subsystems (3)
PATCH 1/3 drm/amd/pm: fix vclk setting failed for SMU v13.0.5
PMFW use the left-shifted 16 bits argument to set the VCLK DPM frequency for SMU v13.0.5.
--- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +9 -2
@@ -831,6 +831,8 @@ static int smu_v13_0_5_set_soft_freq_limited_range(struct smu_context *smu, uint32_t max) {enum smu_message_type msg_set_min, msg_set_max; +uint32_t min_clk = min; +uint32_t max_clk = max;int ret =0 ;if (!smu_v13_0_5_clk_dpm_is_enabled (smu, clk_type))
@@ -851,11 +853,16 @@ static int smu_v13_0_5_set_soft_freq_limited_range(struct smu_context *smu,return -EINVAL ; } - ret =smu_cmn_send_smc_msg_with_param (smu, msg_set_min, min,NULL ); +if (clk_type ==SMU_VCLK ) { + min_clk = min <<SMU_13_VCLK_SHIFT ; + max_clk = max <<SMU_13_VCLK_SHIFT ; + } + + ret =smu_cmn_send_smc_msg_with_param (smu, msg_set_min, min_clk,NULL );if (ret) goto out; - ret =smu_cmn_send_smc_msg_with_param (smu, msg_set_max, max,NULL ); + ret =smu_cmn_send_smc_msg_with_param (smu, msg_set_max, max_clk,NULL );if (ret) goto out;
Signature · 1 line
2.34.1
PATCH 2/3 drm/amd/pm: enable vclk and dclk Pstates for SMU v13.0.5
Add the ability to control the vclk and dclk frequency by power_dpm_force_performance_level interface.
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +29 -0
@@ -983,19 +983,31 @@ static int smu_v13_0_5_set_performance_level(struct smu_context *smu, {struct amdgpu_device *adev = smu->adev;uint32_t sclk_min =0 , sclk_max =0 ; +uint32_t vclk_min =0 , vclk_max =0 ; +uint32_t dclk_min =0 , dclk_max =0 ;int ret =0 ;switch (level) {case AMD_DPM_FORCED_LEVEL_HIGH :smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &sclk_max); +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &vclk_max); +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &dclk_max); sclk_min = sclk_max; + vclk_min = vclk_max; + dclk_min = dclk_max;break ;case AMD_DPM_FORCED_LEVEL_LOW :smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL ); +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min,NULL ); +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min,NULL ); sclk_max = sclk_min; + vclk_max = vclk_min; + dclk_max = dclk_min;break ;case AMD_DPM_FORCED_LEVEL_AUTO :smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min, &dclk_max);break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK :
@@ -1023,6 +1035,23 @@ static int smu_v13_0_5_set_performance_level(struct smu_context *smu, smu->gfx_actual_soft_max_freq = sclk_max; } +if (vclk_min && vclk_max) { + ret =smu_v13_0_5_set_soft_freq_limited_range (smu, +SMU_VCLK , + vclk_min, + vclk_max); +if (ret) +return ret; + } + +if (dclk_min && dclk_max) { + ret =smu_v13_0_5_set_soft_freq_limited_range (smu, +SMU_DCLK , + dclk_min, + dclk_max); +if (ret) +return ret; + }return ret; }
Signature · 1 line
2.34.1
PATCH 3/3 drm/amd/pm: enable more Pstates profile levels for SMU v13.0.5
In reply to Tim HuangThis patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.
- profile_peak
- profile_min_sclk
- profile_standard
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 40 ++++++++++++++++++- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h | 2 +- 2 files changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +38 -2
@@ -978,6 +978,38 @@ static int smu_v13_0_5_force_clk_levels(struct smu_context *smu,return ret; } +static int smu_v13_0_5_get_dpm_profile_freq (struct smu_context *smu, +enum amd_dpm_forced_level level, +enum smu_clk_type clk_type, +uint32_t *min_clk, +uint32_t *max_clk) +{ +int ret =0 ; +uint32_t clk_limit =0 ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + clk_limit =SMU_13_0_5_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &clk_limit); +break ; +default : + ret = -EINVAL ; +break ; + } + *min_clk = *max_clk = clk_limit; +return ret; +} +static int smu_v13_0_5_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {
@@ -1011,10 +1043,14 @@ static int smu_v13_0_5_set_performance_level(struct smu_context *smu,break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK : -case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : -/* Temporarily do nothing since the optimal clocks haven't been provided yet */ +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max);break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK : +dev_err (adev->dev,"The performance level profile_min_mclk is not supported." ); +return -EOPNOTSUPP ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :return 0 ;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h +1 -1
@@ -24,6 +24,6 @@#define __SMU_V13_0_5_PPT_H__extern void smu_v13_0_5_set_ppt_funcs (struct smu_context *smu); -#define SMU_13_0_5_UMD_PSTATE_GFXCLK 1100 +#define SMU_13_0_5_UMD_PSTATE_GFXCLK 700#endif
Signature · 1 line
2.34.1
Re: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.5
[Public]
Series is:
________________________________
From: Huang, Tim <[email protected]>
Sent: Friday, June 9, 2023 6:44 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.5
This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.
- profile_peak
- profile_min_sclk
- profile_standard
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 40 ++++++++++++++++++- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h | 2 +- 2 files changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +38 -2
@@ -978,6 +978,38 @@ static int smu_v13_0_5_force_clk_levels(struct smu_context *smu,return ret; } +static int smu_v13_0_5_get_dpm_profile_freq (struct smu_context *smu, +enum amd_dpm_forced_level level, +enum smu_clk_type clk_type, +uint32_t *min_clk, +uint32_t *max_clk) +{ +int ret =0 ; +uint32_t clk_limit =0 ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + clk_limit =SMU_13_0_5_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &clk_limit); +break ; +default : + ret = -EINVAL ; +break ; + } + *min_clk = *max_clk = clk_limit; +return ret; +} +static int smu_v13_0_5_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {
@@ -1011,10 +1043,14 @@ static int smu_v13_0_5_set_performance_level(struct smu_context *smu,break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK : -case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : -/* Temporarily do nothing since the optimal clocks haven't been provided yet */ +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max);break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK : +dev_err (adev->dev,"The performance level profile_min_mclk is not supported." ); +return -EOPNOTSUPP ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :return 0 ;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h +1 -1
@@ -24,6 +24,6 @@#define __SMU_V13_0_5_PPT_H__extern void smu_v13_0_5_set_ppt_funcs (struct smu_context *smu); -#define SMU_13_0_5_UMD_PSTATE_GFXCLK 1100 +#define SMU_13_0_5_UMD_PSTATE_GFXCLK 700#endif
--
2.34.1
Re: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.5
In reply to Tim Huang[AMD Official Use Only - General]
This series is:
Best Regards,
Yifan
________________________________
From: Huang, Tim <[email protected]>
Sent: Friday, June 9, 2023 6:44 PM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.5
This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.
- profile_peak
- profile_min_sclk
- profile_standard
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 40 ++++++++++++++++++- .../drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h | 2 +- 2 files changed, 39 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c +38 -2
@@ -978,6 +978,38 @@ static int smu_v13_0_5_force_clk_levels(struct smu_context *smu,return ret; } +static int smu_v13_0_5_get_dpm_profile_freq (struct smu_context *smu, +enum amd_dpm_forced_level level, +enum smu_clk_type clk_type, +uint32_t *min_clk, +uint32_t *max_clk) +{ +int ret =0 ; +uint32_t clk_limit =0 ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + clk_limit =SMU_13_0_5_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v13_0_5_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &clk_limit); +break ; +default : + ret = -EINVAL ; +break ; + } + *min_clk = *max_clk = clk_limit; +return ret; +} +static int smu_v13_0_5_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {
@@ -1011,10 +1043,14 @@ static int smu_v13_0_5_set_performance_level(struct smu_context *smu,break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK : -case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK : -/* Temporarily do nothing since the optimal clocks haven't been provided yet */ +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_5_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max);break ; +case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK : +dev_err (adev->dev,"The performance level profile_min_mclk is not supported." ); +return -EOPNOTSUPP ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :return 0 ;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.h +1 -1
@@ -24,6 +24,6 @@#define __SMU_V13_0_5_PPT_H__extern void smu_v13_0_5_set_ppt_funcs (struct smu_context *smu); -#define SMU_13_0_5_UMD_PSTATE_GFXCLK 1100 +#define SMU_13_0_5_UMD_PSTATE_GFXCLK 700#endif
--
2.34.1