drm/amd/pm: fix vclk setting failed for SMU v13.0.4
Subsystems (3)
PATCH 1/3 drm/amd/pm: fix vclk setting failed for SMU v13.0.4
PMFW use the left-shifted 16 bits argument to set the VCLK DPM frequency for SMU v13.0.4.
--- drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 ++ drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +2 -0
@@ -51,6 +51,8 @@#define CTF_OFFSET_HOTSPOT 5#define CTF_OFFSET_MEM 5 +#define SMU_13_VCLK_SHIFT 16 +extern const int pmfw_decoded_link_speed[5 ];extern const int pmfw_decoded_link_width[7 ];
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +9 -2
@@ -831,6 +831,8 @@ static int smu_v13_0_4_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_4_clk_dpm_is_enabled (smu, clk_type))
@@ -859,12 +861,17 @@ static int smu_v13_0_4_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)return ret;return smu_cmn_send_smc_msg_with_param (smu, msg_set_max, - max,NULL ); + max_clk,NULL ); } static int smu_v13_0_4_force_clk_levels(struct smu_context *smu,
Signature · 1 line
2.34.1
PATCH 2/3 drm/amd/pm: enable vclk and dclk Pstates for SMU v13.0.4
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_4_ppt.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +29 -0
@@ -915,6 +915,8 @@ static int smu_v13_0_4_set_performance_level(struct smu_context *smu,uint32_t sclk_min =0 , sclk_max =0 ;uint32_t fclk_min =0 , fclk_max =0 ;uint32_t socclk_min =0 , socclk_max =0 ; +uint32_t vclk_min =0 , vclk_max =0 ; +uint32_t dclk_min =0 , dclk_max =0 ;int ret =0 ;switch (level) {
@@ -922,22 +924,32 @@ static int smu_v13_0_4_set_performance_level(struct smu_context *smu,smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &sclk_max);smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &fclk_max);smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &socclk_max); +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &vclk_max); +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &dclk_max); sclk_min = sclk_max; fclk_min = fclk_max; socclk_min = socclk_max; + vclk_min = vclk_max; + dclk_min = dclk_max;break ;case AMD_DPM_FORCED_LEVEL_LOW :smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL );smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min,NULL );smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min,NULL ); +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min,NULL ); +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min,NULL ); sclk_max = sclk_min; fclk_max = fclk_min; socclk_max = socclk_min; + vclk_max = vclk_min; + dclk_max = dclk_min;break ;case AMD_DPM_FORCED_LEVEL_AUTO :smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min, &sclk_max);smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min, &fclk_max);smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min, &socclk_max); +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_4_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 :
@@ -983,6 +995,23 @@ static int smu_v13_0_4_set_performance_level(struct smu_context *smu,return ret; } +if (vclk_min && vclk_max) { + ret =smu_v13_0_4_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_4_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.4
In reply to Tim HuangThis patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.
- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +53 -1
@@ -54,6 +54,10 @@#define FEATURE_MASK (feature) (1ULL << feature) +#define SMU_13_0_4_UMD_PSTATE_GFXCLK 938 +#define SMU_13_0_4_UMD_PSTATE_SOCCLK 938 +#define SMU_13_0_4_UMD_PSTATE_FCLK 1875 +#define SMC_DPM_FEATURE ( \ FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ FEATURE_MASK(FEATURE_VCN_DPM_BIT) | \
@@ -908,6 +912,50 @@ static int smu_v13_0_4_force_clk_levels(struct smu_context *smu,return ret; } +static int smu_v13_0_4_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_4_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_SOCCLK : + clk_limit =SMU_13_0_4_UMD_PSTATE_SOCCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &clk_limit); +break ; +case SMU_FCLK : + clk_limit =SMU_13_0_4_UMD_PSTATE_FCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v13_0_4_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_4_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {
@@ -955,7 +1003,11 @@ static int smu_v13_0_4_set_performance_level(struct smu_context *smu,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_4_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_FCLK , &fclk_min, &fclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_SOCCLK , &socclk_min, &socclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max);break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
Signature · 1 line
2.34.1
Re: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.4
[Public]
Series is:
________________________________
From: Huang, Tim <[email protected]>
Sent: Wednesday, June 7, 2023 4:02 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Liu, Aaron <[email protected]>; Guo, Shikai <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.4
This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.
- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +53 -1
@@ -54,6 +54,10 @@#define FEATURE_MASK (feature) (1ULL << feature) +#define SMU_13_0_4_UMD_PSTATE_GFXCLK 938 +#define SMU_13_0_4_UMD_PSTATE_SOCCLK 938 +#define SMU_13_0_4_UMD_PSTATE_FCLK 1875 +#define SMC_DPM_FEATURE ( \ FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ FEATURE_MASK(FEATURE_VCN_DPM_BIT) | \
@@ -908,6 +912,50 @@ static int smu_v13_0_4_force_clk_levels(struct smu_context *smu,return ret; } +static int smu_v13_0_4_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_4_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_SOCCLK : + clk_limit =SMU_13_0_4_UMD_PSTATE_SOCCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &clk_limit); +break ; +case SMU_FCLK : + clk_limit =SMU_13_0_4_UMD_PSTATE_FCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v13_0_4_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_4_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {
@@ -955,7 +1003,11 @@ static int smu_v13_0_4_set_performance_level(struct smu_context *smu,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_4_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_FCLK , &fclk_min, &fclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_SOCCLK , &socclk_min, &socclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max);break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
--
2.34.1
Re: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.4
In reply to Tim Huang[AMD Official Use Only - General]
Series is:
________________________________
From: Huang, Tim <[email protected]>
Sent: Wednesday, June 7, 2023 4:02 PM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Liu, Aaron <[email protected]>; Guo, Shikai <[email protected]>; Huang, Tim <[email protected]>
Subject: [PATCH 3/3] drm/amd/pm: enable more Pstates profile levels for SMU v13.0.4
This patch enables following UMD stable Pstates profile levels for power_dpm_force_performance_level interface.
- profile_peak
- profile_min_mclk
- profile_min_sclk
- profile_standard
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 54 ++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +53 -1
@@ -54,6 +54,10 @@#define FEATURE_MASK (feature) (1ULL << feature) +#define SMU_13_0_4_UMD_PSTATE_GFXCLK 938 +#define SMU_13_0_4_UMD_PSTATE_SOCCLK 938 +#define SMU_13_0_4_UMD_PSTATE_FCLK 1875 +#define SMC_DPM_FEATURE ( \ FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ FEATURE_MASK(FEATURE_VCN_DPM_BIT) | \
@@ -908,6 +912,50 @@ static int smu_v13_0_4_force_clk_levels(struct smu_context *smu,return ret; } +static int smu_v13_0_4_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_4_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_SOCCLK : + clk_limit =SMU_13_0_4_UMD_PSTATE_SOCCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &clk_limit); +break ; +case SMU_FCLK : + clk_limit =SMU_13_0_4_UMD_PSTATE_FCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_FCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v13_0_4_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v13_0_4_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_4_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {
@@ -955,7 +1003,11 @@ static int smu_v13_0_4_set_performance_level(struct smu_context *smu,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_4_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_FCLK , &fclk_min, &fclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_SOCCLK , &socclk_min, &socclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v13_0_4_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max);break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
--
2.34.1