drm/amd/pm: populate Sienna Cichlid default overdrive table settings
Subsystems (3)
PATCH 1/3 drm/amd/pm: populate Sienna Cichlid default overdrive table settings
Populate the bootup overdrive table settings.
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +38 -0
@@ -314,6 +314,12 @@ static int sienna_cichlid_check_powerplay_table(struct smu_context *smu) table_context->thermal_controller_type = powerplay_table->thermal_controller_type; +/* +* Instead of having its own buffer space and get overdrive_table copied, +* smu->od_settings just points to the actual overdrive_table +*/ + smu->od_settings = &powerplay_table->overdrive_table; +return 0 ; }
@@ -1694,6 +1700,37 @@ static int sienna_cichlid_get_dpm_ultimate_freq(struct smu_context *smu,return ret; } +static void sienna_cichlid_dump_od_table (struct smu_context *smu, +OverDriveTable_t *od_table) +{ +dev_dbg (smu->adev->dev,"OD: Gfxclk: (%d, %d)\n" , od_table->GfxclkFmin, + od_table->GfxclkFmax); +dev_dbg (smu->adev->dev,"OD: Uclk: (%d, %d)\n" , od_table->UclkFmin, + od_table->UclkFmax); +} + +static int sienna_cichlid_set_default_od_settings (struct smu_context *smu) +{ +OverDriveTable_t *od_table = + (OverDriveTable_t *)smu->smu_table.overdrive_table; +OverDriveTable_t *boot_od_table = + (OverDriveTable_t *)smu->smu_table.boot_overdrive_table; +int ret =0 ; + + ret =smu_cmn_update_table (smu,SMU_TABLE_OVERDRIVE , +0 , (void *)od_table, false); +if (ret) { +dev_err (smu->adev->dev,"Failed to get overdrive table!\n" ); +return ret; + } + +memcpy (boot_od_table, od_table,sizeof (OverDriveTable_t)); + +sienna_cichlid_dump_od_table (smu, od_table); + +return 0 ; +} +static int sienna_cichlid_run_btc (struct smu_context *smu) {return smu_cmn_send_smc_msg (smu, SMU_MSG_RunDcBtc,NULL );
@@ -2817,6 +2854,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .mode1_reset = smu_v11_0_mode1_reset, .get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq, .set_soft_freq_limited_range = smu_v11_0_set_soft_freq_limited_range, + .set_default_od_settings = sienna_cichlid_set_default_od_settings, .run_btc = sienna_cichlid_run_btc, .set_power_source = smu_v11_0_set_power_source, .get_pp_feature_mask = smu_cmn_get_pp_feature_mask,
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amd/pm: enable Sienna Cichlid overdrive support
Enable Sienna Cichlid gfxclk/uclk overdrive support.
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 3 +- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 241 ++++++++++++++++++ 2 files changed, 243 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +2 -1
@@ -730,7 +730,8 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* * - minimum and maximum engine clock labeled OD_SCLK * -* - maximum memory clock labeled OD_MCLK +* - minimum(not available for Vega20 and Navi1x) and maximum memory +* clock labeled OD_MCLK * * - three <frequency, voltage> points labeled OD_VDDC_CURVE. * They can be used to calibrate the sclk voltage curve.
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +241 -0
276 lines not on this page · raw message
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/pm: support overdrive vddgfx offset setting(V2)
In reply to Evan QuanThis is supported by Sienna Cichlid, Navy Flounder and Dimgrey Cavefish. For these ASICs, the target voltage calculation can be illustrated by "voltage = voltage calculated from v/f curve + overdrive vddgfx offset".
V2: limit the smu_version check for Sienna Cichlid only
Here are some sample usages about this new OD setting:
1. Check current vddgfx offset setting by
cat /sys/class/drm/card0/device/pp_od_clk_voltage
...
...OD_VDDGFX_OFFSET:
0mV
...
...
2. Set new vddgfx offset by
echo "vo 10" > /sys/class/drm/card0/device/pp_od_clk_voltage cat /sys/class/drm/card0/device/pp_od_clk_voltage
...
...OD_VDDGFX_OFFSET:
10mV
...
...
3. Commit the new setting by
echo "c" > /sys/class/drm/card0/device/pp_od_clk_voltage
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 3 +- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 17 ++++++- drivers/gpu/drm/amd/pm/inc/smu_types.h | 1 + .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 51 +++++++++++++++++++ 4 files changed, 70 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +2 -1
@@ -157,7 +157,8 @@ enum PP_OD_DPM_TABLE_COMMAND {PP_OD_EDIT_MCLK_VDDC_TABLE ,PP_OD_EDIT_VDDC_CURVE ,PP_OD_RESTORE_DEFAULT_TABLE , -PP_OD_COMMIT_DPM_TABLE +PP_OD_COMMIT_DPM_TABLE , +PP_OD_EDIT_VDDGFX_OFFSET }; struct pp_states_info {
drivers/gpu/drm/amd/pm/amdgpu_pm.c +16 -1
@@ -736,6 +736,12 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* - three <frequency, voltage> points labeled OD_VDDC_CURVE. * They can be used to calibrate the sclk voltage curve. * +* - voltage offset(in mV) applied on target voltage calculation. +* This is available for Sienna Cichlid, Navy Flounder and Dimgrey +* Cavefish. For these ASICs, the target voltage calculation can be +* illustrated by "voltage = voltage calculated from v/f curve + +* overdrive vddgfx offset" +* * - a list of valid ranges for sclk, mclk, and voltage curve points * labeled OD_RANGE *
@@ -756,6 +762,11 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* 600mV. "vc 2 1000 1000" will update point3 with clock set * as 1000Mhz and voltage 1000mV. * +* To update the voltage offset applied for gfxclk/voltage calculation, +* enter the new value by writing a string that contains "vo offset". +* This is supported by Sienna Cichlid, Navy Flounder and Dimgrey Cavefish. +* And the offset can be a positive or negative value. +* * - When you have edited all of the states as needed, write "c" (commit) * to the file to commit your changes *
@@ -796,6 +807,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, type =PP_OD_COMMIT_DPM_TABLE ; else if (!strncmp(buf, "vc", 2)) type =PP_OD_EDIT_VDDC_CURVE ; + else if (!strncmp(buf, "vo", 2)) + type =PP_OD_EDIT_VDDGFX_OFFSET ; else return -EINVAL;
@@ -803,7 +816,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, tmp_str = buf_cpy; -if (type ==PP_OD_EDIT_VDDC_CURVE ) +if ((type ==PP_OD_EDIT_VDDC_CURVE ) || + (type ==PP_OD_EDIT_VDDGFX_OFFSET )) tmp_str++;while (isspace (*++tmp_str));
@@ -899,6 +913,7 @@ static ssize_t amdgpu_get_pp_od_clk_voltage(struct device *dev, size =smu_print_clk_levels (&adev->smu,SMU_OD_SCLK , buf); size +=smu_print_clk_levels (&adev->smu,SMU_OD_MCLK , buf+size); size +=smu_print_clk_levels (&adev->smu,SMU_OD_VDDC_CURVE , buf+size); + size +=smu_print_clk_levels (&adev->smu,SMU_OD_VDDGFX_OFFSET , buf+size); size +=smu_print_clk_levels (&adev->smu,SMU_OD_RANGE , buf+size); }else if (adev->powerplay.pp_funcs->print_clock_levels) { size =amdgpu_dpm_print_clock_levels (adev,OD_SCLK , buf);
drivers/gpu/drm/amd/pm/inc/smu_types.h +1 -0
@@ -240,6 +240,7 @@ enum smu_clk_type {SMU_OD_MCLK ,SMU_OD_VDDC_CURVE ,SMU_OD_RANGE , +SMU_OD_VDDGFX_OFFSET , SMU_CLK_COUNT, };
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +51 -0
88 lines not on this page · raw message
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx