drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1
Subsystems (3)
PATCH 1/1 drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1
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/smu14/smu_v14_0_0_ppt.c | 150 ++++++++++++++++-- 1 file changed, 137 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +137 -13
@@ -65,6 +65,10 @@#define SMU_MALL_PG_CONFIG_DEFAULT SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ON +#define SMU_14_0_0_UMD_PSTATE_GFXCLK 700 +#define SMU_14_0_0_UMD_PSTATE_SOCCLK 678 +#define SMU_14_0_0_UMD_PSTATE_FCLK 1800 +#define FEATURE_MASK (feature) (1ULL << feature)#define SMC_DPM_FEATURE ( \ FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \
@@ -723,10 +727,10 @@ static int smu_v14_0_common_get_dpm_freq_by_index(struct smu_context *smu,uint32_t dpm_level, uint32_t *freq) { - if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) - smu_v14_0_0_get_dpm_freq_by_index(smu, clk_type, dpm_level, freq); - else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) + if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) smu_v14_0_1_get_dpm_freq_by_index(smu, clk_type, dpm_level, freq); + else +smu_v14_0_0_get_dpm_freq_by_index (smu ,clk_type ,dpm_level ,freq );return 0 ; }
@@ -818,9 +822,11 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu,break ;case SMU_MCLK :case SMU_UCLK : -case SMU_FCLK : max_dpm_level =0 ;break ; +case SMU_FCLK : + max_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; +break ;case SMU_SOCCLK : max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ;break ;
@@ -855,7 +861,7 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu, min_dpm_level = clk_table->NumMemPstatesEnabled -1 ;break ;case SMU_FCLK : - min_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; + min_dpm_level =0 ;break ;case SMU_SOCCLK : min_dpm_level =0 ;
@@ -936,9 +942,11 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu,break ;case SMU_MCLK :case SMU_UCLK : -case SMU_FCLK : max_dpm_level =0 ;break ; +case SMU_FCLK : + max_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; +break ;case SMU_SOCCLK : max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ;break ;
@@ -969,7 +977,7 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu, min_dpm_level = clk_table->NumMemPstatesEnabled -1 ;break ;case SMU_FCLK : - min_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; + min_dpm_level =0 ;break ;case SMU_SOCCLK : min_dpm_level =0 ;
@@ -999,10 +1007,10 @@ static int smu_v14_0_common_get_dpm_ultimate_freq(struct smu_context *smu, uint32_t *min, uint32_t *max) { -if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,0 )) -smu_v14_0_0_get_dpm_ultimate_freq (smu, clk_type, min, max); -else if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 )) +if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 ))smu_v14_0_1_get_dpm_ultimate_freq (smu, clk_type, min, max); +else if (clk_type !=SMU_VCLK1 && clk_type !=SMU_DCLK1 ) +smu_v14_0_0_get_dpm_ultimate_freq (smu, clk_type, min, max);return 0 ; }
@@ -1268,13 +1276,67 @@ static int smu_v14_0_0_force_clk_levels(struct smu_context *smu,return ret; } -static int smu_v14_0_0_set_performance_level (struct smu_context *smu, +static int smu_v14_0_common_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) +{ +uint32_t clk_limit =0 ; +int ret =0 ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_SOCCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_SOCCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &clk_limit); +break ; +case SMU_FCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_FCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_VCLK1 : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 ,NULL , &clk_limit); +break ; +case SMU_DCLK : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &clk_limit); +break ; +case SMU_DCLK1 : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 ,NULL , &clk_limit); +break ; +default : + ret = -EINVAL ; +break ; + } + *min_clk = *max_clk = clk_limit; +return ret; +} + +static int smu_v14_0_common_set_performance_level (struct smu_context *smu,enum amd_dpm_forced_level level) {struct amdgpu_device *adev = smu->adev;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 ; +uint32_t vclk1_min =0 , vclk1_max =0 ; +uint32_t dclk1_min =0 , dclk1_max =0 ;int ret =0 ;switch (level) {
@@ -1282,28 +1344,54 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu,smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &sclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &fclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &socclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &vclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &dclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 ,NULL , &vclk1_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 ,NULL , &dclk1_max); sclk_min = sclk_max; fclk_min = fclk_max; socclk_min = socclk_max; + vclk_min = vclk_max; + dclk_min = dclk_max; + vclk1_min = vclk1_max; + dclk1_min = dclk1_max;break ;case AMD_DPM_FORCED_LEVEL_LOW :smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL );smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min,NULL );smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 , &vclk1_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 , &dclk1_min,NULL ); sclk_max = sclk_min; fclk_max = fclk_min; socclk_max = socclk_min; + vclk_max = vclk_min; + dclk_max = dclk_min; + vclk1_max = vclk1_min; + dclk1_max = dclk1_min;break ;case AMD_DPM_FORCED_LEVEL_AUTO :smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min, &sclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min, &fclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min, &socclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min, &vclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min, &dclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 , &vclk1_min, &vclk1_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 , &dclk1_min, &dclk1_max);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_v14_0_common_get_dpm_profile_freq (smu, level,SMU_SCLK , &sclk_min, &sclk_max); +smu_v14_0_common_get_dpm_profile_freq (smu, level,SMU_FCLK , &fclk_min, &fclk_max); +smu_v14_0_common_get_dpm_profile_freq (smu, level,SMU_SOCCLK , &socclk_min, &socclk_max); +smu_v14_0_common_get_dpm_profile_freq (smu, level,SMU_VCLK , &vclk_min, &vclk_max); +smu_v14_0_common_get_dpm_profile_freq (smu, level,SMU_DCLK , &dclk_min, &dclk_max); +smu_v14_0_common_get_dpm_profile_freq (smu, level,SMU_VCLK1 , &vclk1_min, &vclk1_max); +smu_v14_0_common_get_dpm_profile_freq (smu, level,SMU_DCLK1 , &dclk1_min, &dclk1_max);break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
@@ -1343,6 +1431,42 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu,return ret; } +if (vclk_min && vclk_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_VCLK , + vclk_min, + vclk_max); +if (ret) +return ret; + } + +if (vclk1_min && vclk1_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_VCLK1 , + vclk1_min, + vclk1_max); +if (ret) +return ret; + } + +if (dclk_min && dclk_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_DCLK , + dclk_min, + dclk_max); +if (ret) +return ret; + } + +if (dclk1_min && dclk1_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_DCLK1 , + dclk1_min, + dclk1_max); +if (ret) +return ret; + } +return ret; }
@@ -1520,7 +1644,7 @@ static const struct pptable_funcs smu_v14_0_0_ppt_funcs = { .od_edit_dpm_table = smu_v14_0_od_edit_dpm_table, .print_clk_levels = smu_v14_0_0_print_clk_levels, .force_clk_levels = smu_v14_0_0_force_clk_levels, - .set_performance_level = smu_v14_0_0_set_performance_level, + .set_performance_level = smu_v14_0_common_set_performance_level, .set_fine_grain_gfx_freq_parameters = smu_v14_0_common_set_fine_grain_gfx_freq_parameters, .set_gfx_power_up_by_imu = smu_v14_0_set_gfx_power_up_by_imu, .dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,
Signature · 1 line
2.25.1
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Li,
Quoted 60 lines
-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Monday, July 1, 2024 4:23 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Ma, Li <[email protected]>
Subject: [PATCH] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1This patch enables following UMD stable Pstates profile levels for
power_dpm_force_performance_levelinterface.-
profile_peak
-profile_min_mclk
-profile_min_sclk
-profile_standardSigned-off-by Li Ma <[email protected]>--- .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 150 ++++++++++++++++-- 1 file changed, 137 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0
-0@@ -65,6 +65,10 @@#define SMU_MALL_PG_CONFIG_DEFAULT
SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ONdrivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4
-0+#define SMU_14_0_0_UMD_PSTATE_GFXCLK 700 +#define SMU_14_0_0_UMD_PSTATE_SOCCLK 678 +#define SMU_14_0_0_UMD_PSTATE_FCLK 1800 +#define FEATURE_MASK (feature) (1ULL << feature) #defineSMC_DPM_FEATURE ( \ FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ @@ -723,10 +727,10 @@ static int smu_v14_0_common_get_dpm_freq_by_index(struct smu_context *smu, uint32_t dpm_level, uint32_t *freq){
- if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)== IP_VERSION(14, 0,
0))
- smu_v14_0_0_get_dpm_freq_by_index(smu,clk_type,dpm_level,
freq);
- else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)== IP_VERSION(14,
0, 1))
+ if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)== IP_VERSION(14, 0,
1))smu_v14_0_1_get_dpm_freq_by_index(smu, clk_type, dpm_level,freq);
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2
-0+else + smu_v14_0_0_get_dpm_freq_by_index(smu, clk_type, dpm_level,freq);
Quoted 2 lines
return 0;}
Does this conflict with the ongoing commit drm/amd/pm: smu v14.0.4 reuse smu v14.0.0 dpmtable ?
Tim
Quoted 293 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3
-1@@ -818,9 +822,11 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu, break;case SMU_MCLK :case SMU_UCLK : -case SMU_FCLK : max_dpm_level =0 ;break ; +case SMU_FCLK : + max_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; +break ;case SMU_SOCCLK : max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ;break;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1
-1@@ -855,7 +861,7 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu, min_dpm_level = clk_table->NumMemPstatesEnabled -1 ;break ;case SMU_FCLK : - min_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; + min_dpm_level =0 ;break ;case SMU_SOCCLK :min_dpm_level = 0;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3
-1@@ -936,9 +942,11 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu, break;case SMU_MCLK :case SMU_UCLK : -case SMU_FCLK : max_dpm_level =0 ;break ; +case SMU_FCLK : + max_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; +break ;case SMU_SOCCLK : max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ;break;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1
-1@@ -969,7 +977,7 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu, min_dpm_level = clk_table->NumMemPstatesEnabled -1 ;break ;case SMU_FCLK : - min_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; + min_dpm_level =0 ;break ;case SMU_SOCCLK :min_dpm_level = 0;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +41
-4@@ -999,10 +1007,10 @@ static int smu_v14_0_common_get_dpm_ultimate_freq(struct smu_context *smu, uint32_t *min, uint32_t *max) { - if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) - smu_v14_0_0_get_dpm_ultimate_freq(smu, clk_type, min, max); - else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1)) + if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 1))smu_v14_0_1_get_dpm_ultimate_freq (smu, clk_type, min, max); + else if (clk_type != SMU_VCLK1 && clk_type != SMU_DCLK1) + smu_v14_0_0_get_dpm_ultimate_freq(smu, clk_type, min, max);return 0 ; }@@ -1268,13 +1276,67 @@ static int smu_v14_0_0_force_clk_levels(structsmu_context *smu, return ret; } -static int smu_v14_0_0_set_performance_level (struct smu_context *smu, +static int smu_v14_0_common_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) +{ +uint32_t clk_limit =0 ; +int ret =0 ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_SOCCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_SOCCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &clk_limit); +break ; +case SMU_FCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_FCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_VCLK1 : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 ,NULL , &clk_limit); +break ; +case SMU_DCLK : + smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,NULL,
&clk_limit);drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3
-0+break ; +case SMU_DCLK1 : + smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,NULL,
&clk_limit);drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +33
-0+break ; +default : + ret = -EINVAL ; +break ; + } + *min_clk = *max_clk = clk_limit; +return ret; +} + +static int smu_v14_0_common_set_performance_level (struct smu_context +*smu,enum amd_dpm_forced_level level) {struct amdgpu_device *adev = smu->adev;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 ; +uint32_t vclk1_min =0 , vclk1_max =0 ; +uint32_t dclk1_min =0 , dclk1_max =0 ;int ret =0 ;switch (level) {@@ -1282,28 +1344,54 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu,smu_v14_0_common_get_dpm_ultimate_freq (smu, SMU_SCLK, NULL, &sclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &fclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &socclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &vclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &dclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 ,NULL , &vclk1_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 ,NULL , +&dclk1_max); sclk_min = sclk_max; fclk_min = fclk_max; socclk_min = socclk_max; + vclk_min = vclk_max; + dclk_min = dclk_max; + vclk1_min = vclk1_max; + dclk1_min = dclk1_max;break ;case AMD_DPM_FORCED_LEVEL_LOW :smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL );smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min,NULL );smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 , &vclk1_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 , &dclk1_min, +NULL ); sclk_max = sclk_min; fclk_max = fclk_min; socclk_max = socclk_min; + vclk_max = vclk_min; + dclk_max = dclk_min; + vclk1_max = vclk1_min; + dclk1_max = dclk1_min;break ;case AMD_DPM_FORCED_LEVEL_AUTO : smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,&sclk_min, &sclk_max); smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, &fclk_min, &fclk_max); smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,
&socclk_min,&socclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_VCLK,&vclk_min,&vclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_DCLK,&dclk_min,&dclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_VCLK1,&vclk1_min,&vclk1_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_DCLK1,&dclk1_min,+&dclk1_max); 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_v14_0_common_get_dpm_profile_freq(smu, level,SMU_SCLK,&sclk_min,&sclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_FCLK,&fclk_min,&fclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_SOCCLK,&socclk_min,&socclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_VCLK,&vclk_min,&vclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_DCLK,&dclk_min,&dclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_VCLK1,&vclk1_min,&vclk1_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_DCLK1,+&dclk1_min, &dclk1_max); break; case AMD_DPM_FORCED_LEVEL_MANUAL: case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +37
-1@@ -1343,6 +1431,42 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu, return ret; } +if (vclk_min && vclk_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_VCLK , + vclk_min, + vclk_max); +if (ret) +return ret; + } + +if (vclk1_min && vclk1_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_VCLK1 , + vclk1_min, + vclk1_max); +if (ret) +return ret; + } + +if (dclk_min && dclk_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_DCLK , + dclk_min, + dclk_max); +if (ret) +return ret; + } + +if (dclk1_min && dclk1_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_DCLK1 , + dclk1_min, + dclk1_max); +if (ret) +return ret; + } +return ret; }@@ -1520,7 +1644,7 @@ static const struct pptable_funcs smu_v14_0_0_ppt_funcs = { .od_edit_dpm_table = smu_v14_0_od_edit_dpm_table, .print_clk_levels = smu_v14_0_0_print_clk_levels, .force_clk_levels = smu_v14_0_0_force_clk_levels, - .set_performance_level = smu_v14_0_0_set_performance_level, + .set_performance_level = smu_v14_0_common_set_performance_level, .set_fine_grain_gfx_freq_parameters = smu_v14_0_common_set_fine_grain_gfx_freq_parameters,.set_gfx_power_up_by_imu = smu_v14_0_set_gfx_power_up_by_imu, .dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,--
2.25.1
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Tim,
Quoted 77 lines
-----Original Message-----
From: Huang, Tim <[email protected]>
Sent: Monday, July 1, 2024 5:34 PM
To: Ma, Li <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>
Subject: RE: [PATCH] drm/amd/swsmu: enable more Pstates profile levels for SMU v14.0.0 and v14.0.1[AMD Official Use Only - AMD Internal Distribution Only]
Hi Li,
Quoted 8 lines
-----Original Message-----
From: Ma, Li <[email protected]>
Sent: Monday, July 1, 2024 4:23 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Huang, Tim <[email protected]>; Ma, Li <[email protected]>
Subject: [PATCH] drm/amd/swsmu: enable more Pstates profile levels forSMU
Quoted 31 lines
v14.0.0 and v14.0.1
This patch enables following UMD stable Pstates profile levels for
power_dpm_force_performance_levelinterface.-
profile_peak
-profile_min_mclk
-profile_min_sclk
-profile_standardSigned-off-by Li Ma <[email protected]>--- .../drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 150 ++++++++++++++++-- 1 file changed, 137 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0
-0@@ -65,6 +65,10 @@#define SMU_MALL_PG_CONFIG_DEFAULT
SMU_MALL_PG_CONFIG_DRIVER_CONTROL_ALWAYS_ONdrivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +4
-0+#define SMU_14_0_0_UMD_PSTATE_GFXCLK 700 +#define SMU_14_0_0_UMD_PSTATE_SOCCLK 678 +#define SMU_14_0_0_UMD_PSTATE_FCLK 1800 +#define FEATURE_MASK (feature) (1ULL << feature) #defineQuoted 2 lines
SMC_DPM_FEATURE ( \ FEATURE_MASK(FEATURE_CCLK_DPM_BIT) | \ @@ -723,10 +727,10@@
Quoted 1 line
static int smu_v14_0_common_get_dpm_freq_by_index(struct
smu_contextQuoted 9 lines
*smu,
uint32_t dpm_level, uint32_t *freq){
- if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)== IP_VERSION(14, 0,
0))
- smu_v14_0_0_get_dpm_freq_by_index(smu,clk_type,dpm_level,
freq);
- else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)==IP_VERSION(14,
Quoted 9 lines
0, 1))
+ if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0)== IP_VERSION(14, 0,
1))smu_v14_0_1_get_dpm_freq_by_index(smu, clk_type, dpm_level,freq);
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +2
-0+else + smu_v14_0_0_get_dpm_freq_by_index(smu, clk_type, dpm_level,freq);
Quoted 7 lines
Quoted 2 lines
return 0;}
Does this conflict with the ongoing commit drm/amd/pm: smu v14.0.4 reuse smu v14.0.0 dpmtable ?
Tim
Li: Thanks for reminder, the change in smu_v14_0_common_get_dpm_freq_by_index and smu_v14_0_common_get_dpm_ultimate_freq are same as ongoing commit "drm/amd/pm: smu v14.0.4 reuse smu v14.0.0 dpmtable". I will remove this change to avoid the repetition.
Quoted 298 lines
Quoted 50 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3
-1@@ -818,9 +822,11 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu, break;case SMU_MCLK :case SMU_UCLK : -case SMU_FCLK : max_dpm_level =0 ;break ; +case SMU_FCLK : + max_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; +break ;case SMU_SOCCLK : max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ;break;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1
-1@@ -855,7 +861,7 @@ static int smu_v14_0_1_get_dpm_ultimate_freq(struct smu_context *smu, min_dpm_level = clk_table->NumMemPstatesEnabled -1 ;break ;case SMU_FCLK : - min_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; + min_dpm_level =0 ;break ;case SMU_SOCCLK :min_dpm_level = 0;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3
-1@@ -936,9 +942,11 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu, break;case SMU_MCLK :case SMU_UCLK : -case SMU_FCLK : max_dpm_level =0 ;break ; +case SMU_FCLK : + max_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; +break ;case SMU_SOCCLK : max_dpm_level = clk_table->NumSocClkLevelsEnabled -1 ;break;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +1
-1@@ -969,7 +977,7 @@ static int smu_v14_0_0_get_dpm_ultimate_freq(struct smu_context *smu, min_dpm_level = clk_table->NumMemPstatesEnabled -1 ;break ;case SMU_FCLK : - min_dpm_level = clk_table->NumFclkLevelsEnabled -1 ; + min_dpm_level =0 ;break ;case SMU_SOCCLK :min_dpm_level = 0;drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c static int · line 1006
Quoted 8 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +0
-3@@ -999,10 +1007,10 @@ static int smu_v14_0_common_get_dpm_ultimate_freq(struct smu_context *smu, uint32_t *min, uint32_t *max) { - if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(14, 0, 0)) - smu_v14_0_0_get_dpm_ultimate_freq(smu, clk_type, min, max); - else if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) ==IP_VERSION(14,
Quoted 159 lines
drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +41
-10, 1)) +if (amdgpu_ip_version (smu->adev,MP1_HWIP ,0 ) ==IP_VERSION (14 ,0 ,1 ))smu_v14_0_1_get_dpm_ultimate_freq (smu, clk_type, min, max); +else if (clk_type !=SMU_VCLK1 && clk_type !=SMU_DCLK1 ) +smu_v14_0_0_get_dpm_ultimate_freq (smu, clk_type, min, max);return 0 ; }@@ -1268,13 +1276,67 @@ static int smu_v14_0_0_force_clk_levels(structsmu_context *smu, return ret; } -static int smu_v14_0_0_set_performance_level (struct smu_context *smu, +static int smu_v14_0_common_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) +{ +uint32_t clk_limit =0 ; +int ret =0 ; + +switch (clk_type) { +case SMU_GFXCLK : +case SMU_SCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_GFXCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &clk_limit,NULL ); +break ; +case SMU_SOCCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_SOCCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &clk_limit); +break ; +case SMU_FCLK : + clk_limit =SMU_14_0_0_UMD_PSTATE_FCLK ; +if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_PEAK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &clk_limit); +else if (level ==AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK ) +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &clk_limit,NULL ); +break ; +case SMU_VCLK : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &clk_limit); +break ; +case SMU_VCLK1 : +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 ,NULL , &clk_limit); +break ; +case SMU_DCLK : + smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK,NULL,
&clk_limit);drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +3
-0+break ; +case SMU_DCLK1 : + smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_DCLK1,NULL,
&clk_limit);drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +33
-0+break ; +default : + ret = -EINVAL ; +break ; + } + *min_clk = *max_clk = clk_limit; +return ret; +} + +static int smu_v14_0_common_set_performance_level (struct smu_context +*smu,enum amd_dpm_forced_level level) {struct amdgpu_device *adev = smu->adev;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 ; +uint32_t vclk1_min =0 , vclk1_max =0 ; +uint32_t dclk1_min =0 , dclk1_max =0 ;int ret =0 ;switch (level) {@@ -1282,28 +1344,54 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu,smu_v14_0_common_get_dpm_ultimate_freq (smu, SMU_SCLK, NULL, &sclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK ,NULL , &fclk_max);smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK ,NULL , &socclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK ,NULL , &vclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK ,NULL , &dclk_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 ,NULL , &vclk1_max); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 ,NULL , +&dclk1_max); sclk_min = sclk_max; fclk_min = fclk_max; socclk_min = socclk_max; + vclk_min = vclk_max; + dclk_min = dclk_max; + vclk1_min = vclk1_max; + dclk1_min = dclk1_max;break ;case AMD_DPM_FORCED_LEVEL_LOW :smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SCLK , &sclk_min,NULL );smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_FCLK , &fclk_min,NULL );smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_SOCCLK , &socclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK , &vclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK , &dclk_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_VCLK1 , &vclk1_min,NULL ); +smu_v14_0_common_get_dpm_ultimate_freq (smu,SMU_DCLK1 , &dclk1_min, +NULL ); sclk_max = sclk_min; fclk_max = fclk_min; socclk_max = socclk_min; + vclk_max = vclk_min; + dclk_max = dclk_min; + vclk1_max = vclk1_min; + dclk1_max = dclk1_min;break ;case AMD_DPM_FORCED_LEVEL_AUTO : smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SCLK,&sclk_min, &sclk_max); smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_FCLK, &fclk_min, &fclk_max); smu_v14_0_common_get_dpm_ultimate_freq(smu, SMU_SOCCLK,
&socclk_min,&socclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_VCLK,&vclk_min,&vclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_DCLK,&dclk_min,&dclk_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_VCLK1,&vclk1_min,&vclk1_max);
+ smu_v14_0_common_get_dpm_ultimate_freq(smu,SMU_DCLK1,&dclk1_min,+&dclk1_max); 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:Quoted 11 lines
- /* Temporarily do nothing since the optimal clocks haven't been
provided yet */
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_SCLK,&sclk_min,&sclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_FCLK,&fclk_min,&fclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_SOCCLK,&socclk_min,&socclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_VCLK,&vclk_min,&vclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_DCLK,Quoted 2 lines
&dclk_min,&dclk_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,
SMU_VCLK1,Quoted 64 lines
&vclk1_min,&vclk1_max);
+ smu_v14_0_common_get_dpm_profile_freq(smu, level,SMU_DCLK1,+&dclk1_min, &dclk1_max); break; case AMD_DPM_FORCED_LEVEL_MANUAL: case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT:drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c +37
-1@@ -1343,6 +1431,42 @@ static int smu_v14_0_0_set_performance_level(struct smu_context *smu, return ret; } +if (vclk_min && vclk_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_VCLK , + vclk_min, + vclk_max); +if (ret) +return ret; + } + +if (vclk1_min && vclk1_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_VCLK1 , + vclk1_min, + vclk1_max); +if (ret) +return ret; + } + +if (dclk_min && dclk_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_DCLK , + dclk_min, + dclk_max); +if (ret) +return ret; + } + +if (dclk1_min && dclk1_max) { + ret =smu_v14_0_0_set_soft_freq_limited_range (smu, +SMU_DCLK1 , + dclk1_min, + dclk1_max); +if (ret) +return ret; + } +return ret; }@@ -1520,7 +1644,7 @@ static const struct pptable_funcs smu_v14_0_0_ppt_funcs = { .od_edit_dpm_table = smu_v14_0_od_edit_dpm_table, .print_clk_levels = smu_v14_0_0_print_clk_levels, .force_clk_levels = smu_v14_0_0_force_clk_levels, - .set_performance_level = smu_v14_0_0_set_performance_level, + .set_performance_level = smu_v14_0_common_set_performance_level, .set_fine_grain_gfx_freq_parameters = smu_v14_0_common_set_fine_grain_gfx_freq_parameters,.set_gfx_power_up_by_imu = smu_v14_0_set_gfx_power_up_by_imu, .dpm_set_vpe_enable = smu_v14_0_0_set_vpe_enable,--
2.25.1