drm/amd: Allow printing VanGogh OD SCLK levels without setting dpm to manual
Subsystems (3)
PATCH RESEND 1/2 drm/amd: Allow printing VanGogh OD SCLK levels without setting dpm to manual
From: Mario Limonciello <[email protected]>
Several other ASICs allow printing OD SCLK levels without setting DPM control to manual. When OD is disabled it will show the range the hardware supports. When OD is enabled it will show what values have been programmed. Adjust VanGogh to work the same.
--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +15 -22
@@ -666,7 +666,6 @@ static int vangogh_print_clk_levels(struct smu_context *smu, {DpmClocks_t *clk_table = smu->smu_table.clocks_table;SmuMetrics_t metrics; -struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);int i, idx, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 ;bool cur_value_match_level = false;
@@ -682,31 +681,25 @@ static int vangogh_print_clk_levels(struct smu_context *smu,switch (clk_type) {case SMU_OD_SCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , - (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , - (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_SCLK" ); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq); + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq);break ;case SMU_OD_CCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"CCLK_RANGE in Core%d:\n" , smu->cpu_core_id_select); - size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , - (smu->cpu_actual_soft_min_freq >0 ) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); - size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , - (smu->cpu_actual_soft_max_freq >0 ) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"CCLK_RANGE in Core%d:\n" , smu->cpu_core_id_select); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , + (smu->cpu_actual_soft_min_freq >0 ) ? smu->cpu_actual_soft_min_freq : smu->cpu_default_soft_min_freq); + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , + (smu->cpu_actual_soft_max_freq >0 ) ? smu->cpu_actual_soft_max_freq : smu->cpu_default_soft_max_freq);break ;case SMU_OD_RANGE : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); - size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , - smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); - size +=sysfs_emit_at (buf, size,"CCLK: %7uMhz %10uMhz\n" , - smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq); - } + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , + smu->gfx_default_hard_min_freq, smu->gfx_default_soft_max_freq); + size +=sysfs_emit_at (buf, size,"CCLK: %7uMhz %10uMhz\n" , + smu->cpu_default_soft_min_freq, smu->cpu_default_soft_max_freq);break ;case SMU_SOCCLK :/* the level 3 ~ 6 of socclk use the same frequency for vangogh */
Signature · 1 line
2.43.0
PATCH RESEND 2/2 drm/amd: Allow printing Renoir OD SCLK levels without setting dpm to manual
From: Mario Limonciello <[email protected]>
Several other ASICs allow printing OD SCLK levels without setting DPM control to manual. When OD is disabled it will show the range the hardware supports. When OD is enabled it will show what values have been programmed. Adjust Renoir to work the same.
---
v2:
* Drop extra variable
--- .../gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +16 -21
@@ -497,7 +497,6 @@ static int renoir_print_clk_levels(struct smu_context *smu,int i, idx, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 , min =0 , max =0 ;SmuMetrics_t metrics; -struct smu_dpm_context *smu_dpm_ctx = &(smu->smu_dpm);bool cur_value_match_level = false;memset (&metrics,0 ,sizeof (metrics));
@@ -510,28 +509,24 @@ static int renoir_print_clk_levels(struct smu_context *smu,switch (clk_type) {case SMU_OD_RANGE : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - ret =smu_cmn_send_smc_msg_with_param (smu, - SMU_MSG_GetMinGfxclkFrequency, -0 , &min); -if (ret) -return ret; - ret =smu_cmn_send_smc_msg_with_param (smu, - SMU_MSG_GetMaxGfxclkFrequency, -0 , &max); -if (ret) -return ret; - size +=sysfs_emit_at (buf, size,"OD_RANGE\nSCLK: %10uMhz %10uMhz\n" , min, max); - } + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetMinGfxclkFrequency, +0 , &min); +if (ret) +return ret; + ret =smu_cmn_send_smc_msg_with_param (smu, + SMU_MSG_GetMaxGfxclkFrequency, +0 , &max); +if (ret) +return ret; + size +=sysfs_emit_at (buf, size,"OD_RANGE\nSCLK: %10uMhz %10uMhz\n" , min, max);break ;case SMU_OD_SCLK : -if (smu_dpm_ctx->dpm_level ==AMD_DPM_FORCED_LEVEL_MANUAL ) { - min = (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq; - max = (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq; - size +=sysfs_emit_at (buf, size,"OD_SCLK\n" ); - size +=sysfs_emit_at (buf, size,"0:%10uMhz\n" , min); - size +=sysfs_emit_at (buf, size,"1:%10uMhz\n" , max); - } + min = (smu->gfx_actual_hard_min_freq >0 ) ? smu->gfx_actual_hard_min_freq : smu->gfx_default_hard_min_freq; + max = (smu->gfx_actual_soft_max_freq >0 ) ? smu->gfx_actual_soft_max_freq : smu->gfx_default_soft_max_freq; + size +=sysfs_emit_at (buf, size,"OD_SCLK\n" ); + size +=sysfs_emit_at (buf, size,"0:%10uMhz\n" , min); + size +=sysfs_emit_at (buf, size,"1:%10uMhz\n" , max);break ;case SMU_GFXCLK :case SMU_SCLK :
Signature · 1 line
2.43.0