navi10: Implement overdrive pp_od_clk_voltage
Subsystems (2)
v2 cover navi10: Implement overdrive pp_od_clk_voltage
[Why]
Before this patchset, navi10 users could not utilize the overdrive functionality. This prevented them from overclocking, overvolting, or undervolting their cards.
[How]
Similar to the vega20 implementation, add the pp_od_clk_voltage interface to the navi10 powerplay table.
[Possible Alternatives]
This could also be done more generically in smu_v11_0 code, but would require more significant changes to the vega20 code, and feature-gating based on chip capabilities in the smu to disable overdrive for arcterus. I chose this path so as not to completely refactor the vega20 side of things, and introduce SMU code which would not play nicely with new ASICs.
v2: rebase off latest code, and remove an incorrect bounds check
Matt Coffin (3):
drm/amdgpu/navi10: implement sclk/mclk OD via pp_od_clk_voltage drm/amdgpu/navi10: implement GFXCLK_CURVE overdrive drm/amdgpu/navi10: Implement od clk printing
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 282 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 2 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 27 ++ 4 files changed, 313 insertions(+)
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 1/3 drm/amdgpu/navi10: implement sclk/mclk OD via pp_od_clk_voltage
In reply to a message not in the archive[Why]
Before this patch, there was no way to use pp_od_clk_voltage on navi
[How]
Similar to the vega20 implementation, but using the common smc_v11_0 headers, implemented the pp_od_clk_voltage API for navi10's pptable implementation
--- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 180 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 27 +++ 3 files changed, 209 insertions(+)
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -0
@@ -250,4 +250,6 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_int smu_v11_0_override_pcie_parameters (struct smu_context *smu); +int smu_v11_0_set_default_od_settings (struct smu_context *smu,bool initialize,size_t overdrive_table_size); +#endif
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +180 -0
196 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +27 -0
@@ -1779,3 +1779,30 @@ int smu_v11_0_override_pcie_parameters(struct smu_context *smu)return ret; } + +int smu_v11_0_set_default_od_settings (struct smu_context *smu,bool initialize,size_t overdrive_table_size) +{ +struct smu_table_context *table_context = &smu->smu_table; +int ret =0 ; + +if (initialize) { +if (table_context->overdrive_table) { +return -EINVAL ; + } + table_context->overdrive_table =kzalloc (overdrive_table_size,GFP_KERNEL ); +if (!table_context->overdrive_table) { +return -ENOMEM ; + } + ret =smu_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , table_context->overdrive_table, false); +if (ret) { +pr_err ("Failed to export overdrive table!\n" ); +return ret; + } + } + ret =smu_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , table_context->overdrive_table, true); +if (ret) { +pr_err ("Failed to import overdrive table!\n" ); +return ret; + } +return ret; +}
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/3 drm/amdgpu/navi10: implement GFXCLK_CURVE overdrive
In reply to a message not in the archive[Why]
Before this patch, there was no way to set the gfxclk voltage curve in the overdrive settings for navi10 through pp_od_clk_voltage
[How]
Add the required implementation to navi10's ppt dpm table editing implementation, similar to the vega20 implementation and interface.
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 60 +++++++++++++++++++++- drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 2 + 2 files changed, 60 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +58 -2
@@ -1728,6 +1728,8 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLstruct smu_table_context *table_context = &smu->smu_table;OverDriveTable_t *od_table;struct smu_11_0_overdrive_table *od_settings; +enum SMU_11_0_ODSETTING_ID freq_setting, voltage_setting; +uint16_t *freq_ptr, *voltage_ptr; od_table = (OverDriveTable_t *)table_context->overdrive_table;if (!smu->od_enabled) {
@@ -1824,8 +1826,62 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL }break ;case PP_OD_EDIT_VDDC_CURVE : -// TODO: implement -return -ENOSYS ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_GFXCLK_CURVE )) { +pr_warn ("GFXCLK_CURVE not supported!\n" ); +return -ENOTSUPP ; + } +if (size <3 ) { +pr_info ("invalid number of parameters: %d\n" , size); +return -EINVAL ; + } +if (!od_table) { +pr_info ("Overdrive is not initialized\n" ); +return -EINVAL ; + } + +switch (input[0 ]) { +case 0 : + freq_setting =SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P1 ; + voltage_setting =SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P1 ; + freq_ptr = &od_table->GfxclkFreq1; + voltage_ptr = &od_table->GfxclkVolt1; +break ; +case 1 : + freq_setting =SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P2 ; + voltage_setting =SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P2 ; + freq_ptr = &od_table->GfxclkFreq2; + voltage_ptr = &od_table->GfxclkVolt2; +break ; +case 2 : + freq_setting =SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P3 ; + voltage_setting =SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P3 ; + freq_ptr = &od_table->GfxclkFreq3; + voltage_ptr = &od_table->GfxclkVolt3; +break ; +default : +pr_info ("Invalid VDDC_CURVE index: %ld\n" , input[0 ]); +pr_info ("Supported indices: [0, 1, 2]\n" ); +return -EINVAL ; + } + ret =navi10_od_setting_check_range (od_settings, freq_setting, input[1 ]); +if (ret) +return ret; +// Allow setting zero to disable the OverDrive VDDC curve +if (input[2 ] !=0 ) { + ret =navi10_od_setting_check_range (od_settings, voltage_setting, input[2 ]); +if (ret) +return ret; + *freq_ptr = input[1 ]; + *voltage_ptr = ((uint16_t )input[2 ]) *NAVI10_VOLTAGE_SCALE ; +pr_debug ("OD: set curve %ld: (%d, %d)\n" , input[0 ], *freq_ptr, *voltage_ptr); + }else { +// If setting 0, disable all voltage curve settings + od_table->GfxclkVolt1 =0 ; + od_table->GfxclkVolt2 =0 ; + od_table->GfxclkVolt3 =0 ; + } +navi10_dump_od_table (od_table); +break ;default :return -ENOSYS ; }
drivers/gpu/drm/amd/powerplay/navi10_ppt.h +2 -0
@@ -33,6 +33,8 @@#define NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK (1717)#define NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK (1448) +#define NAVI10_VOLTAGE_SCALE (4) +extern void navi10_set_ppt_funcs (struct smu_context *smu);#endif
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/3 drm/amdgpu/navi10: Implement od clk printing
In reply to a message not in the archive[Why]
Before this patch, navi10 overdrive settings could not be printed via pp_od_clk_voltage
[How]
Implement printing for the overdrive settings for the following clocks in navi10's ppt print_clk_levels implementation:
* SMU_OD_SCLK
* SMU_OD_MCLK
* SMU_OD_VDDC_CURVE
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 56 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +51 -5
@@ -691,13 +691,25 @@ static bool navi10_is_support_fine_grained_dpm(struct smu_context *smu, enum smureturn dpm_desc->SnapToDiscrete ==0 ? true : false; } +static inline bool navi10_od_feature_is_supported (struct smu_11_0_overdrive_table *od_table,enum SMU_11_0_ODFEATURE_ID feature) +{ +return od_table->cap[feature]; +} + +static int navi10_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf) { +OverDriveTable_t *od_table; +struct smu_11_0_overdrive_table *od_settings; +uint16_t *curve_settings;int i, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 ;uint32_t freq_values[3 ] = {0 };uint32_t mark_index =0 ; +struct smu_table_context *table_context = &smu->smu_table; + od_table = (OverDriveTable_t *)table_context->overdrive_table; + od_settings = smu->od_settings;switch (clk_type) {case SMU_GFXCLK :
@@ -748,6 +760,45 @@ static int navi10_print_clk_levels(struct smu_context *smu, }break ; +case SMU_OD_SCLK : +if (!smu->od_enabled || !od_table || !od_settings) +break ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_GFXCLK_LIMITS )) +break ; + size +=sprintf (buf + size,"OD_SCLK:\n" ); + size +=sprintf (buf + size,"0: %uMhz\n1: %uMhz\n" , od_table->GfxclkFmin, od_table->GfxclkFmax); +break ; +case SMU_OD_MCLK : +if (!smu->od_enabled || !od_table || !od_settings) +break ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_UCLK_MAX )) +break ; + size +=sprintf (buf + size,"OD_MCLK:\n" ); + size +=sprintf (buf + size,"0: %uMHz\n" , od_table->UclkFmax); +break ; +case SMU_OD_VDDC_CURVE : +if (!smu->od_enabled || !od_table || !od_settings) +break ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_GFXCLK_CURVE )) +break ; + size +=sprintf (buf + size,"OD_VDDC_CURVE:\n" ); +for (i =0 ; i <3 ; i++) { +switch (i) { +case 0 : + curve_settings = &od_table->GfxclkFreq1; +break ; +case 1 : + curve_settings = &od_table->GfxclkFreq2; +break ; +case 2 : + curve_settings = &od_table->GfxclkFreq3; +break ; +default : +break ; + } + size +=sprintf (buf + size,"%d: %uMHz @ %umV\n" , i, curve_settings[0 ], curve_settings[1 ] /NAVI10_VOLTAGE_SCALE ); + } +break ;default :break ; }
@@ -1661,11 +1712,6 @@ static inline void navi10_dump_od_table(OverDriveTable_t *od_table) {pr_debug ("OD: OverDrivePct: %d\n" , od_table->OverDrivePct); } -static inline bool navi10_od_feature_is_supported (struct smu_11_0_overdrive_table *od_table,enum SMU_11_0_ODFEATURE_ID feature) -{ -return od_table->cap[feature]; -} -static int navi10_od_setting_check_range (struct smu_11_0_overdrive_table *od_table,enum SMU_11_0_ODSETTING_ID setting,uint32_t value) {if (value < od_table->min[setting]) {
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Series is reviewed-by: Evan Quan <[email protected]>
Quoted 30 lines
-----Original Message-----
From: Matt Coffin <[email protected]>
Sent: Saturday, November 9, 2019 5:28 AM
To: [email protected]; Quan, Evan <[email protected]>
Cc: Matt Coffin <[email protected]>; Deucher, Alexander <[email protected]>
Subject: [PATCH v2 0/3] navi10: Implement overdrivepp_od_clk_voltage[Why]
Before this patchset, navi10 users could not utilize the overdrive functionality. This prevented them from overclocking, overvolting, or undervolting their cards.[How]
Similar to the vega20 implementation, add thepp_od_clk_voltageinterface to the navi10 powerplay table.[Possible Alternatives]
This could also be done more generically insmu_v11_0code, but would require more significant changes to the vega20 code, and feature-gating based on chip capabilities in the smu to disable overdrive for arcterus.
I chose this path so as not to completely refactor the vega20 side of things, and introduce SMU code which would not play nicely with new ASICs.v2: rebase off latest code, and remove an incorrect bounds check
Matt Coffin (3):
drm/amdgpu/navi10: implement sclk/mclk OD viapp_od_clk_voltagedrm/amdgpu/navi10: implementGFXCLK_CURVEoverdrive drm/amdgpu/navi10: Implement od clk printing
Quoted 8 lines
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 282 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 2 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 27 ++ 4 files changed, 313 insertions(+)--
2.23.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Patches are missing your Signed-off-by. Please follow up with that and I'll apply them.
Thanks!
Alex
Quoted 31 lines · Matt Coffin
[Why]
Before this patchset, navi10 users could not utilize the overdrive functionality. This prevented them from overclocking, overvolting, or undervolting their cards.[How]
Similar to the vega20 implementation, add thepp_od_clk_voltageinterface to the navi10 powerplay table.[Possible Alternatives]
This could also be done more generically insmu_v11_0code, but would require more significant changes to the vega20 code, and feature-gating based on chip capabilities in the smu to disable overdrive for arcterus. I chose this path so as not to completely refactor the vega20 side of things, and introduce SMU code which would not play nicely with new ASICs.v2: rebase off latest code, and remove an incorrect bounds check
Matt Coffin (3):
drm/amdgpu/navi10: implement sclk/mclk OD viapp_od_clk_voltagedrm/amdgpu/navi10: implementGFXCLK_CURVEoverdrive drm/amdgpu/navi10: Implement od clk printingdrivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 282 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 2 + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 27 ++ 4 files changed, 313 insertions(+)
Quoted 7 lines
--
2.23.0_______________________________________________
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
PATCH v2 1/3 drm/amdgpu/navi10: implement sclk/mclk OD via pp_od_clk_voltage
In reply to a message not in the archive[Why]
Before this patch, there was no way to use pp_od_clk_voltage on navi
[How]
Similar to the vega20 implementation, but using the common smc_v11_0 headers, implemented the pp_od_clk_voltage API for navi10's pptable implementation
--- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 180 ++++++++++++++++++ drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 27 +++ 3 files changed, 209 insertions(+)
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -0
@@ -250,4 +250,6 @@ int smu_v11_0_set_soft_freq_limited_range(struct smu_context *smu, enum smu_clk_int smu_v11_0_override_pcie_parameters (struct smu_context *smu); +int smu_v11_0_set_default_od_settings (struct smu_context *smu,bool initialize,size_t overdrive_table_size); +#endif
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +180 -0
196 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +27 -0
@@ -1779,3 +1779,30 @@ int smu_v11_0_override_pcie_parameters(struct smu_context *smu)return ret; } + +int smu_v11_0_set_default_od_settings (struct smu_context *smu,bool initialize,size_t overdrive_table_size) +{ +struct smu_table_context *table_context = &smu->smu_table; +int ret =0 ; + +if (initialize) { +if (table_context->overdrive_table) { +return -EINVAL ; + } + table_context->overdrive_table =kzalloc (overdrive_table_size,GFP_KERNEL ); +if (!table_context->overdrive_table) { +return -ENOMEM ; + } + ret =smu_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , table_context->overdrive_table, false); +if (ret) { +pr_err ("Failed to export overdrive table!\n" ); +return ret; + } + } + ret =smu_update_table (smu,SMU_TABLE_OVERDRIVE ,0 , table_context->overdrive_table, true); +if (ret) { +pr_err ("Failed to import overdrive table!\n" ); +return ret; + } +return ret; +}
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/3 drm/amdgpu/navi10: implement GFXCLK_CURVE overdrive
In reply to a message not in the archive[Why]
Before this patch, there was no way to set the gfxclk voltage curve in the overdrive settings for navi10 through pp_od_clk_voltage
[How]
Add the required implementation to navi10's ppt dpm table editing implementation, similar to the vega20 implementation and interface.
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 60 +++++++++++++++++++++- drivers/gpu/drm/amd/powerplay/navi10_ppt.h | 2 + 2 files changed, 60 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +58 -2
@@ -1728,6 +1728,8 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABLstruct smu_table_context *table_context = &smu->smu_table;OverDriveTable_t *od_table;struct smu_11_0_overdrive_table *od_settings; +enum SMU_11_0_ODSETTING_ID freq_setting, voltage_setting; +uint16_t *freq_ptr, *voltage_ptr; od_table = (OverDriveTable_t *)table_context->overdrive_table;if (!smu->od_enabled) {
@@ -1824,8 +1826,62 @@ static int navi10_od_edit_dpm_table(struct smu_context *smu, enum PP_OD_DPM_TABL }break ;case PP_OD_EDIT_VDDC_CURVE : -// TODO: implement -return -ENOSYS ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_GFXCLK_CURVE )) { +pr_warn ("GFXCLK_CURVE not supported!\n" ); +return -ENOTSUPP ; + } +if (size <3 ) { +pr_info ("invalid number of parameters: %d\n" , size); +return -EINVAL ; + } +if (!od_table) { +pr_info ("Overdrive is not initialized\n" ); +return -EINVAL ; + } + +switch (input[0 ]) { +case 0 : + freq_setting =SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P1 ; + voltage_setting =SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P1 ; + freq_ptr = &od_table->GfxclkFreq1; + voltage_ptr = &od_table->GfxclkVolt1; +break ; +case 1 : + freq_setting =SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P2 ; + voltage_setting =SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P2 ; + freq_ptr = &od_table->GfxclkFreq2; + voltage_ptr = &od_table->GfxclkVolt2; +break ; +case 2 : + freq_setting =SMU_11_0_ODSETTING_VDDGFXCURVEFREQ_P3 ; + voltage_setting =SMU_11_0_ODSETTING_VDDGFXCURVEVOLTAGE_P3 ; + freq_ptr = &od_table->GfxclkFreq3; + voltage_ptr = &od_table->GfxclkVolt3; +break ; +default : +pr_info ("Invalid VDDC_CURVE index: %ld\n" , input[0 ]); +pr_info ("Supported indices: [0, 1, 2]\n" ); +return -EINVAL ; + } + ret =navi10_od_setting_check_range (od_settings, freq_setting, input[1 ]); +if (ret) +return ret; +// Allow setting zero to disable the OverDrive VDDC curve +if (input[2 ] !=0 ) { + ret =navi10_od_setting_check_range (od_settings, voltage_setting, input[2 ]); +if (ret) +return ret; + *freq_ptr = input[1 ]; + *voltage_ptr = ((uint16_t )input[2 ]) *NAVI10_VOLTAGE_SCALE ; +pr_debug ("OD: set curve %ld: (%d, %d)\n" , input[0 ], *freq_ptr, *voltage_ptr); + }else { +// If setting 0, disable all voltage curve settings + od_table->GfxclkVolt1 =0 ; + od_table->GfxclkVolt2 =0 ; + od_table->GfxclkVolt3 =0 ; + } +navi10_dump_od_table (od_table); +break ;default :return -ENOSYS ; }
drivers/gpu/drm/amd/powerplay/navi10_ppt.h +2 -0
@@ -33,6 +33,8 @@#define NAVI14_UMD_PSTATE_PEAK_XTX_GFXCLK (1717)#define NAVI14_UMD_PSTATE_PEAK_XL_GFXCLK (1448) +#define NAVI10_VOLTAGE_SCALE (4) +extern void navi10_set_ppt_funcs (struct smu_context *smu);#endif
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/3 drm/amdgpu/navi10: Implement od clk printing
In reply to a message not in the archive[Why]
Before this patch, navi10 overdrive settings could not be printed via pp_od_clk_voltage
[How]
Implement printing for the overdrive settings for the following clocks in navi10's ppt print_clk_levels implementation:
* SMU_OD_SCLK
* SMU_OD_MCLK
* SMU_OD_VDDC_CURVE
--- drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 56 ++++++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +51 -5
@@ -691,13 +691,25 @@ static bool navi10_is_support_fine_grained_dpm(struct smu_context *smu, enum smureturn dpm_desc->SnapToDiscrete ==0 ? true : false; } +static inline bool navi10_od_feature_is_supported (struct smu_11_0_overdrive_table *od_table,enum SMU_11_0_ODFEATURE_ID feature) +{ +return od_table->cap[feature]; +} + +static int navi10_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf) { +OverDriveTable_t *od_table; +struct smu_11_0_overdrive_table *od_settings; +uint16_t *curve_settings;int i, size =0 , ret =0 ;uint32_t cur_value =0 , value =0 , count =0 ;uint32_t freq_values[3 ] = {0 };uint32_t mark_index =0 ; +struct smu_table_context *table_context = &smu->smu_table; + od_table = (OverDriveTable_t *)table_context->overdrive_table; + od_settings = smu->od_settings;switch (clk_type) {case SMU_GFXCLK :
@@ -748,6 +760,45 @@ static int navi10_print_clk_levels(struct smu_context *smu, }break ; +case SMU_OD_SCLK : +if (!smu->od_enabled || !od_table || !od_settings) +break ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_GFXCLK_LIMITS )) +break ; + size +=sprintf (buf + size,"OD_SCLK:\n" ); + size +=sprintf (buf + size,"0: %uMhz\n1: %uMhz\n" , od_table->GfxclkFmin, od_table->GfxclkFmax); +break ; +case SMU_OD_MCLK : +if (!smu->od_enabled || !od_table || !od_settings) +break ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_UCLK_MAX )) +break ; + size +=sprintf (buf + size,"OD_MCLK:\n" ); + size +=sprintf (buf + size,"0: %uMHz\n" , od_table->UclkFmax); +break ; +case SMU_OD_VDDC_CURVE : +if (!smu->od_enabled || !od_table || !od_settings) +break ; +if (!navi10_od_feature_is_supported (od_settings,SMU_11_0_ODFEATURE_GFXCLK_CURVE )) +break ; + size +=sprintf (buf + size,"OD_VDDC_CURVE:\n" ); +for (i =0 ; i <3 ; i++) { +switch (i) { +case 0 : + curve_settings = &od_table->GfxclkFreq1; +break ; +case 1 : + curve_settings = &od_table->GfxclkFreq2; +break ; +case 2 : + curve_settings = &od_table->GfxclkFreq3; +break ; +default : +break ; + } + size +=sprintf (buf + size,"%d: %uMHz @ %umV\n" , i, curve_settings[0 ], curve_settings[1 ] /NAVI10_VOLTAGE_SCALE ); + } +break ;default :break ; }
@@ -1661,11 +1712,6 @@ static inline void navi10_dump_od_table(OverDriveTable_t *od_table) {pr_debug ("OD: OverDrivePct: %d\n" , od_table->OverDrivePct); } -static inline bool navi10_od_feature_is_supported (struct smu_11_0_overdrive_table *od_table,enum SMU_11_0_ODFEATURE_ID feature) -{ -return od_table->cap[feature]; -} -static int navi10_od_setting_check_range (struct smu_11_0_overdrive_table *od_table,enum SMU_11_0_ODSETTING_ID setting,uint32_t value) {if (value < od_table->min[setting]) {
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx