Enable legacy OD support for SMU13
Subsystems (3)
cover Enable legacy OD support for SMU13
Enable the following OD features support for SMU13:
- Maxinum and minimum gfxclk frequency settings
- Maxinum and minimum uclk frequency settings
- Voltage offset settings for gfxclk v/f curve line
- This is quite different from previous generations/ASICs. For SMU13, there are six anchor points defined on the v/f curve. And what user configurable are the voltage offsets for those anchor points.
Evan Quan (4):
drm/amd/pm: update SMU13 header files for coming OD support drm/amd/pm: fulfill SMU13 OD settings init and restore drm/amd/pm: fulfill the OD support for SMU13.0.0 drm/amd/pm: fulfill the OD support for SMU13.0.7
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26 +- .../gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 16 +- .../inc/pmfw_if/smu13_driver_if_v13_0_0.h | 18 +- .../inc/pmfw_if/smu13_driver_if_v13_0_7.h | 29 +- .../amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 16 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 13 +- .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 488 +++++++++++++++++- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 487 ++++++++++++++++- 8 files changed, 1038 insertions(+), 55 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/4 drm/amd/pm: update SMU13 header files for coming OD support
Correct the data structures for OD feature support.
--- .../gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 16 +++++----- .../inc/pmfw_if/smu13_driver_if_v13_0_0.h | 18 +++++++----- .../inc/pmfw_if/smu13_driver_if_v13_0_7.h | 29 ++++--------------- .../amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 16 +++++----- 4 files changed, 34 insertions(+), 45 deletions(-)
drivers/gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h +9 -7
@@ -38,13 +38,12 @@#define SMU_13_0_0_PP_THERMALCONTROLLER_NONE 0#define SMU_13_0_0_PP_THERMALCONTROLLER_NAVI21 28 -#define SMU_13_0_0_PP_OVERDRIVE_VERSION 0x81 // OverDrive 8 Table Version 0.2 +#define SMU_13_0_0_PP_OVERDRIVE_VERSION 0x83 // OverDrive 8 Table Version 0.2#define SMU_13_0_0_PP_POWERSAVINGCLOCK_VERSION 0x01 // Power Saving Clock Table Version 1.00enum SMU_13_0_0_ODFEATURE_CAP {SMU_13_0_0_ODCAP_GFXCLK_LIMITS =0 , -SMU_13_0_0_ODCAP_GFXCLK_CURVE ,SMU_13_0_0_ODCAP_UCLK_LIMITS ,SMU_13_0_0_ODCAP_POWER_LIMIT ,SMU_13_0_0_ODCAP_FAN_ACOUSTIC_LIMIT ,
@@ -59,13 +58,13 @@ enum SMU_13_0_0_ODFEATURE_CAPSMU_13_0_0_ODCAP_FAN_CURVE ,SMU_13_0_0_ODCAP_AUTO_FAN_ACOUSTIC_LIMIT ,SMU_13_0_0_ODCAP_POWER_MODE , +SMU_13_0_0_ODCAP_PER_ZONE_GFX_VOLTAGE_OFFSET , SMU_13_0_0_ODCAP_COUNT, };enum SMU_13_0_0_ODFEATURE_ID {SMU_13_0_0_ODFEATURE_GFXCLK_LIMITS =1 <<SMU_13_0_0_ODCAP_GFXCLK_LIMITS ,//GFXCLK Limit feature -SMU_13_0_0_ODFEATURE_GFXCLK_CURVE =1 <<SMU_13_0_0_ODCAP_GFXCLK_CURVE ,//GFXCLK Curve feature SMU_13_0_0_ODFEATURE_UCLK_LIMITS =1 <<SMU_13_0_0_ODCAP_UCLK_LIMITS ,//UCLK Limit feature SMU_13_0_0_ODFEATURE_POWER_LIMIT =1 <<SMU_13_0_0_ODCAP_POWER_LIMIT ,//Power Limit feature SMU_13_0_0_ODFEATURE_FAN_ACOUSTIC_LIMIT = 1 << SMU_13_0_0_ODCAP_FAN_ACOUSTIC_LIMIT, //Fan Acoustic RPM feature
@@ -80,6 +79,7 @@ enum SMU_13_0_0_ODFEATURE_IDSMU_13_0_0_ODFEATURE_FAN_CURVE =1 <<SMU_13_0_0_ODCAP_FAN_CURVE ,//Fan Curve feature SMU_13_0_0_ODFEATURE_AUTO_FAN_ACOUSTIC_LIMIT =1 <<SMU_13_0_0_ODCAP_AUTO_FAN_ACOUSTIC_LIMIT ,//Auto Fan Acoustic RPM feature SMU_13_0_0_ODFEATURE_POWER_MODE =1 <<SMU_13_0_0_ODCAP_POWER_MODE ,//Optimized GPU Power Mode feature +SMU_13_0_0_ODFEATURE_PER_ZONE_GFX_VOLTAGE_OFFSET =1 <<SMU_13_0_0_ODCAP_PER_ZONE_GFX_VOLTAGE_OFFSET ,//Perzone voltage offset feature SMU_13_0_0_ODFEATURE_COUNT = 16, };
@@ -89,10 +89,6 @@ enum SMU_13_0_0_ODSETTING_ID {SMU_13_0_0_ODSETTING_GFXCLKFMAX =0 ,SMU_13_0_0_ODSETTING_GFXCLKFMIN , -SMU_13_0_0_ODSETTING_CUSTOM_GFX_VF_CURVE_A , -SMU_13_0_0_ODSETTING_CUSTOM_GFX_VF_CURVE_B , -SMU_13_0_0_ODSETTING_CUSTOM_GFX_VF_CURVE_C , -SMU_13_0_0_ODSETTING_CUSTOM_CURVE_VFT_FMIN ,SMU_13_0_0_ODSETTING_UCLKFMIN ,SMU_13_0_0_ODSETTING_UCLKFMAX , SMU_13_0_0_ODSETTING_POWERPERCENTAGE,
@@ -117,6 +113,12 @@ enum SMU_13_0_0_ODSETTING_IDSMU_13_0_0_ODSETTING_FAN_CURVE_SPEED_5 ,SMU_13_0_0_ODSETTING_AUTO_FAN_ACOUSTIC_LIMIT ,SMU_13_0_0_ODSETTING_POWER_MODE , +SMU_13_0_0_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_1 , +SMU_13_0_0_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_2 , +SMU_13_0_0_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_3 , +SMU_13_0_0_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_4 , +SMU_13_0_0_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_5 , +SMU_13_0_0_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_6 , SMU_13_0_0_ODSETTING_COUNT, };#define SMU_13_0_0_MAX_ODSETTING 64 //Maximum Number of ODSettings
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_0.h +11 -7
@@ -678,7 +678,14 @@ typedef enum {#define PP_NUM_RTAVFS_PWL_ZONES 5 - +#define PP_OD_FEATURE_GFX_VF_CURVE_BIT 0 +#define PP_OD_FEATURE_PPT_BIT 2 +#define PP_OD_FEATURE_FAN_CURVE_BIT 3 +#define PP_OD_FEATURE_GFXCLK_BIT 7 +#define PP_OD_FEATURE_UCLK_BIT 8 +#define PP_OD_FEATURE_ZERO_FAN_BIT 9 +#define PP_OD_FEATURE_TEMPERATURE_BIT 10 +#define PP_OD_FEATURE_COUNT 13// VBIOS or PPLIB configures telemetry slope and offset. Only slope expected to be set for SVI3 // Slope Q1.7, Offset Q1.2
@@ -700,10 +707,8 @@ typedef struct {//Voltage control int16_t VoltageOffsetPerZoneBoundary[PP_NUM_OD_VF_CURVE_POINTS ]; -uint16_t VddGfxVmax;// in mV -uint8_t IdlePwrSavingFeaturesCtrl; -uint8_t RuntimePwrSavingFeaturesCtrl; +uint32_t Reserved;//Frequency changes int16_t GfxclkFmin;// MHz
@@ -740,10 +745,9 @@ typedef struct {uint32_t FeatureCtrlMask;int16_t VoltageOffsetPerZoneBoundary; -uint16_t VddGfxVmax;// in mV +uint16_t Reserved1; -uint8_t IdlePwrSavingFeaturesCtrl; -uint8_t RuntimePwrSavingFeaturesCtrl; +uint16_t Reserved2;int16_t GfxclkFmin;// MHz int16_t GfxclkFmax;// MHz
drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_7.h +5 -24
@@ -694,18 +694,12 @@ typedef struct {#define PP_OD_FEATURE_GFX_VF_CURVE_BIT 0 -#define PP_OD_FEATURE_VMAX_BIT 1#define PP_OD_FEATURE_PPT_BIT 2#define PP_OD_FEATURE_FAN_CURVE_BIT 3 -#define PP_OD_FEATURE_FREQ_DETER_BIT 4 -#define PP_OD_FEATURE_FULL_CTRL_BIT 5 -#define PP_OD_FEATURE_TDC_BIT 6#define PP_OD_FEATURE_GFXCLK_BIT 7#define PP_OD_FEATURE_UCLK_BIT 8#define PP_OD_FEATURE_ZERO_FAN_BIT 9#define PP_OD_FEATURE_TEMPERATURE_BIT 10 -#define PP_OD_FEATURE_POWER_FEATURE_CTRL_BIT 11 -#define PP_OD_FEATURE_ASIC_TDC_BIT 12#define PP_OD_FEATURE_COUNT 13 typedef enum {
@@ -724,10 +718,8 @@ typedef struct {//Voltage control int16_t VoltageOffsetPerZoneBoundary[PP_NUM_OD_VF_CURVE_POINTS ]; -uint16_t VddGfxVmax;// in mV -uint8_t IdlePwrSavingFeaturesCtrl; -uint8_t RuntimePwrSavingFeaturesCtrl; +uint32_t Reserved;//Frequency changes int16_t GfxclkFmin;// MHz
@@ -752,12 +744,7 @@ typedef struct {uint8_t MaxOpTemp;uint8_t Padding[4 ]; -uint16_t GfxVoltageFullCtrlMode; -uint16_t GfxclkFullCtrlMode; -uint16_t UclkFullCtrlMode; -int16_t AsicTdc; - -uint32_t Spare[10 ]; +uint32_t Spare[12 ];uint32_t MmHubPadding[8 ];// SMU internal use. Adding here instead of external as a workaround } OverDriveTable_t;
@@ -770,10 +757,9 @@ typedef struct {uint32_t FeatureCtrlMask;int16_t VoltageOffsetPerZoneBoundary; -uint16_t VddGfxVmax;// in mV +uint16_t Reserved1; -uint8_t IdlePwrSavingFeaturesCtrl; -uint8_t RuntimePwrSavingFeaturesCtrl; +uint16_t Reserved2;int16_t GfxclkFmin;// MHz int16_t GfxclkFmax;// MHz
@@ -796,12 +782,7 @@ typedef struct {uint8_t MaxOpTemp;uint8_t Padding[4 ]; -uint16_t GfxVoltageFullCtrlMode; -uint16_t GfxclkFullCtrlMode; -uint16_t UclkFullCtrlMode; -int16_t AsicTdc; - -uint32_t Spare[10 ]; +uint32_t Spare[12 ]; } OverDriveLimits_t;
drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0_7_pptable.h +9 -7
@@ -38,13 +38,12 @@#define SMU_13_0_7_PP_THERMALCONTROLLER_NONE 0#define SMU_13_0_7_PP_THERMALCONTROLLER_NAVI21 28 -#define SMU_13_0_7_PP_OVERDRIVE_VERSION 0x81 // OverDrive 8 Table Version 0.2 +#define SMU_13_0_7_PP_OVERDRIVE_VERSION 0x83 // OverDrive 8 Table Version 0.2#define SMU_13_0_7_PP_POWERSAVINGCLOCK_VERSION 0x01 // Power Saving Clock Table Version 1.00enum SMU_13_0_7_ODFEATURE_CAP {SMU_13_0_7_ODCAP_GFXCLK_LIMITS =0 , -SMU_13_0_7_ODCAP_GFXCLK_CURVE ,SMU_13_0_7_ODCAP_UCLK_LIMITS ,SMU_13_0_7_ODCAP_POWER_LIMIT ,SMU_13_0_7_ODCAP_FAN_ACOUSTIC_LIMIT ,
@@ -59,13 +58,13 @@ enum SMU_13_0_7_ODFEATURE_CAPSMU_13_0_7_ODCAP_FAN_CURVE ,SMU_13_0_7_ODCAP_AUTO_FAN_ACOUSTIC_LIMIT ,SMU_13_0_7_ODCAP_POWER_MODE , +SMU_13_0_7_ODCAP_PER_ZONE_GFX_VOLTAGE_OFFSET , SMU_13_0_7_ODCAP_COUNT, };enum SMU_13_0_7_ODFEATURE_ID {SMU_13_0_7_ODFEATURE_GFXCLK_LIMITS =1 <<SMU_13_0_7_ODCAP_GFXCLK_LIMITS ,//GFXCLK Limit feature -SMU_13_0_7_ODFEATURE_GFXCLK_CURVE =1 <<SMU_13_0_7_ODCAP_GFXCLK_CURVE ,//GFXCLK Curve feature SMU_13_0_7_ODFEATURE_UCLK_LIMITS =1 <<SMU_13_0_7_ODCAP_UCLK_LIMITS ,//UCLK Limit feature SMU_13_0_7_ODFEATURE_POWER_LIMIT =1 <<SMU_13_0_7_ODCAP_POWER_LIMIT ,//Power Limit feature SMU_13_0_7_ODFEATURE_FAN_ACOUSTIC_LIMIT = 1 << SMU_13_0_7_ODCAP_FAN_ACOUSTIC_LIMIT, //Fan Acoustic RPM feature
@@ -80,6 +79,7 @@ enum SMU_13_0_7_ODFEATURE_IDSMU_13_0_7_ODFEATURE_FAN_CURVE =1 <<SMU_13_0_7_ODCAP_FAN_CURVE ,//Fan Curve feature SMU_13_0_7_ODFEATURE_AUTO_FAN_ACOUSTIC_LIMIT =1 <<SMU_13_0_7_ODCAP_AUTO_FAN_ACOUSTIC_LIMIT ,//Auto Fan Acoustic RPM feature SMU_13_0_7_ODFEATURE_POWER_MODE =1 <<SMU_13_0_7_ODCAP_POWER_MODE ,//Optimized GPU Power Mode feature +SMU_13_0_7_ODFEATURE_PER_ZONE_GFX_VOLTAGE_OFFSET =1 <<SMU_13_0_7_ODCAP_PER_ZONE_GFX_VOLTAGE_OFFSET ,//Perzone voltage offset feature SMU_13_0_7_ODFEATURE_COUNT = 16, };
@@ -89,10 +89,6 @@ enum SMU_13_0_7_ODSETTING_ID {SMU_13_0_7_ODSETTING_GFXCLKFMAX =0 ,SMU_13_0_7_ODSETTING_GFXCLKFMIN , -SMU_13_0_7_ODSETTING_CUSTOM_GFX_VF_CURVE_A , -SMU_13_0_7_ODSETTING_CUSTOM_GFX_VF_CURVE_B , -SMU_13_0_7_ODSETTING_CUSTOM_GFX_VF_CURVE_C , -SMU_13_0_7_ODSETTING_CUSTOM_CURVE_VFT_FMIN ,SMU_13_0_7_ODSETTING_UCLKFMIN ,SMU_13_0_7_ODSETTING_UCLKFMAX , SMU_13_0_7_ODSETTING_POWERPERCENTAGE,
@@ -117,6 +113,12 @@ enum SMU_13_0_7_ODSETTING_IDSMU_13_0_7_ODSETTING_FAN_CURVE_SPEED_5 ,SMU_13_0_7_ODSETTING_AUTO_FAN_ACOUSTIC_LIMIT ,SMU_13_0_7_ODSETTING_POWER_MODE , +SMU_13_0_7_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_1 , +SMU_13_0_7_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_2 , +SMU_13_0_7_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_3 , +SMU_13_0_7_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_4 , +SMU_13_0_7_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_5 , +SMU_13_0_7_ODSETTING_PER_ZONE_GFX_VOLTAGE_OFFSET_POINT_6 , SMU_13_0_7_ODSETTING_COUNT, };#define SMU_13_0_7_MAX_ODSETTING 64 //Maximum Number of ODSettings
Signature · 1 line
2.34.1
PATCH 2/4 drm/amd/pm: fulfill SMU13 OD settings init and restore
In reply to Evan QuanGfxclk fmin/fmax, Uclk fmin/fmax and Gfx v/f curve voltage offset OD settings are supported for SMU13.
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26 +++- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 13 +- .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 129 +++++++++++++++++- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 128 ++++++++++++++++- 4 files changed, 286 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +19 -7
@@ -678,7 +678,12 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* clock labeled OD_MCLK * * - three <frequency, voltage> points labeled OD_VDDC_CURVE. -* They can be used to calibrate the sclk voltage curve. +* They can be used to calibrate the sclk voltage curve. This is +* available for Vega20 and NV1X. +* +* - voltage offset for the six anchor points of the v/f curve labeled +* OD_VDDC_CURVE. They can be used to calibrate the v/f curve. This +* is only availabe for some SMU13 ASICs. * * - voltage offset(in mV) applied on target voltage calculation. * This is available for Sienna Cichlid, Navy Flounder and Dimgrey
@@ -719,12 +724,19 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* E.g., "p 2 0 800" would set the minimum core clock on core * 2 to 800Mhz. * -* For sclk voltage curve, enter the new values by writing a -* string that contains "vc point clock voltage" to the file. The -* points are indexed by 0, 1 and 2. E.g., "vc 0 300 600" will -* update point1 with clock set as 300Mhz and voltage as -* 600mV. "vc 2 1000 1000" will update point3 with clock set -* as 1000Mhz and voltage 1000mV. +* For sclk voltage curve, +* - For NV1X, enter the new values by writing a string that +* contains "vc point clock voltage" to the file. The points +* are indexed by 0, 1 and 2. E.g., "vc 0 300 600" will update +* point1 with clock set as 300Mhz and voltage as 600mV. "vc 2 +* 1000 1000" will update point3 with clock set as 1000Mhz and +* voltage 1000mV. +* - For SMU13 ASICs, enter the new values by writing a string that +* contains "vc anchor_point_index voltage_offset" to the file. +* There are total six anchor points defined on the v/f curve with +* index as 0 - 5. +* - "vc 0 10" will update the voltage offset for point1 as 10mv. +* - "vc 5 -10" will update the voltage offset for point6 as -10mv. * * To update the voltage offset applied for gfxclk/voltage calculation, * enter the new value by writing a string that contains "vo offset".
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +12 -1
@@ -467,17 +467,26 @@ int smu_v13_0_init_smc_tables(struct smu_context *smu) ret = -ENOMEM ; goto err3_out; } + + smu_table->user_overdrive_table = +kzalloc (tables[SMU_TABLE_OVERDRIVE ].size,GFP_KERNEL ); +if (!smu_table->user_overdrive_table) { + ret = -ENOMEM ; + goto err4_out; + } } smu_table->combo_pptable =kzalloc (tables[SMU_TABLE_COMBO_PPTABLE ].size,GFP_KERNEL );if (!smu_table->combo_pptable) { ret = -ENOMEM ; - goto err4_out; + goto err5_out; }return 0 ; +err5_out: +kfree (smu_table->user_overdrive_table); err4_out:kfree (smu_table->boot_overdrive_table); err3_out:
@@ -497,12 +506,14 @@ int smu_v13_0_fini_smc_tables(struct smu_context *smu)kfree (smu_table->gpu_metrics_table);kfree (smu_table->combo_pptable); +kfree (smu_table->user_overdrive_table);kfree (smu_table->boot_overdrive_table);kfree (smu_table->overdrive_table);kfree (smu_table->max_sustainable_clocks);kfree (smu_table->driver_pptable); smu_table->gpu_metrics_table =NULL ; smu_table->combo_pptable =NULL ; + smu_table->user_overdrive_table =NULL ; smu_table->boot_overdrive_table =NULL ; smu_table->overdrive_table =NULL ; smu_table->max_sustainable_clocks =NULL ;
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +128 -1
165 lines not on this page · raw message
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +127 -1
164 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 3/4 drm/amd/pm: fulfill the OD support for SMU13.0.0
In reply to Evan QuanFulfill the interfaces for OD settings retrieving and setting.
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 445 ++++++++++++++++-- 1 file changed, 402 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +402 -43
@@ -1037,17 +1037,119 @@ static int smu_v13_0_0_get_current_clk_freq_by_table(struct smu_context *smu, value); } +static bool smu_v13_0_0_is_od_feature_supported (struct smu_context *smu, +int od_feature_bit) +{ +PPTable_t *pptable = smu->smu_table.driver_pptable; +const OverDriveLimits_t *const overdrive_upperlimits = + &pptable->SkuTable.OverDriveLimitsBasicMax; + +return overdrive_upperlimits->FeatureCtrlMask & (1U << od_feature_bit); +} + +static void smu_v13_0_0_get_od_setting_limits (struct smu_context *smu, +int od_feature_bit, +bool lower_boundary, +int32_t *min, +int32_t *max) +{ +PPTable_t *pptable = smu->smu_table.driver_pptable; +const OverDriveLimits_t *const overdrive_upperlimits = + &pptable->SkuTable.OverDriveLimitsBasicMax; +const OverDriveLimits_t *const overdrive_lowerlimits = + &pptable->SkuTable.OverDriveLimitsMin; +int32_t od_min_setting, od_max_setting; + +switch (od_feature_bit) { +case PP_OD_FEATURE_GFXCLK_BIT : +if (lower_boundary) { + od_min_setting = overdrive_lowerlimits->GfxclkFmin; + od_max_setting = overdrive_upperlimits->GfxclkFmin; + }else { + od_min_setting = overdrive_lowerlimits->GfxclkFmax; + od_max_setting = overdrive_upperlimits->GfxclkFmax; + } +break ; +case PP_OD_FEATURE_UCLK_BIT : +if (lower_boundary) { + od_min_setting = overdrive_lowerlimits->UclkFmin; + od_max_setting = overdrive_upperlimits->UclkFmin; + }else { + od_min_setting = overdrive_lowerlimits->UclkFmax; + od_max_setting = overdrive_upperlimits->UclkFmax; + } +break ; +case PP_OD_FEATURE_GFX_VF_CURVE_BIT : + od_min_setting = overdrive_lowerlimits->VoltageOffsetPerZoneBoundary; + od_max_setting = overdrive_upperlimits->VoltageOffsetPerZoneBoundary; +break ; +default : +break ; + } + +if (min) + *min = od_min_setting; +if (max) + *max = od_max_setting; +} + +static void smu_v13_0_0_dump_od_table (struct smu_context *smu, +OverDriveTableExternal_t *od_table) +{ +struct amdgpu_device *adev = smu->adev; + +dev_dbg (adev->dev,"OD: Gfxclk: (%d, %d)\n" , od_table->OverDriveTable.GfxclkFmin, + od_table->OverDriveTable.GfxclkFmax); +dev_dbg (adev->dev,"OD: Uclk: (%d, %d)\n" , od_table->OverDriveTable.UclkFmin, + od_table->OverDriveTable.UclkFmax); +} + +static int smu_v13_0_0_get_overdrive_table (struct smu_context *smu, +OverDriveTableExternal_t *od_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; +} + +static int smu_v13_0_0_upload_overdrive_table (struct smu_context *smu, +OverDriveTableExternal_t *od_table) +{ +int ret =0 ; + + ret =smu_cmn_update_table (smu, +SMU_TABLE_OVERDRIVE , +0 , + (void *)od_table, + true); +if (ret) +dev_err (smu->adev->dev,"Failed to upload overdrive table!\n" ); + +return ret; +} +static int smu_v13_0_0_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf) {struct smu_dpm_context *smu_dpm = &smu->smu_dpm;struct smu_13_0_dpm_context *dpm_context = smu_dpm->dpm_context; +OverDriveTableExternal_t *od_table = + (OverDriveTableExternal_t *)smu->smu_table.overdrive_table;struct smu_13_0_dpm_table *single_dpm_table;struct smu_13_0_pcie_table *pcie_table;const int link_width[] = {0 ,1 ,2 ,4 ,8 ,12 ,16 };uint32_t gen_speed, lane_width;int i, curr_freq, size =0 ; +int32_t min_value, max_value;int ret =0 ;smu_cmn_get_sysfs_buf (&buf, &size);
@@ -1164,6 +1266,89 @@ static int smu_v13_0_0_print_clk_levels(struct smu_context *smu, "*" : "");break ; +case SMU_OD_SCLK : +if (!smu_v13_0_0_is_od_feature_supported (smu, +PP_OD_FEATURE_GFXCLK_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"OD_SCLK:\n" ); + size +=sysfs_emit_at (buf, size,"0: %uMhz\n1: %uMhz\n" , + od_table->OverDriveTable.GfxclkFmin, + od_table->OverDriveTable.GfxclkFmax); +break ; + +case SMU_OD_MCLK : +if (!smu_v13_0_0_is_od_feature_supported (smu, +PP_OD_FEATURE_UCLK_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"OD_MCLK:\n" ); + size +=sysfs_emit_at (buf, size,"0: %uMhz\n1: %uMHz\n" , + od_table->OverDriveTable.UclkFmin, + od_table->OverDriveTable.UclkFmax); +break ; + +case SMU_OD_VDDC_CURVE : +if (!smu_v13_0_0_is_od_feature_supported (smu, +PP_OD_FEATURE_GFX_VF_CURVE_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"OD_VDDC_CURVE:\n" ); +for (i =0 ; i <PP_NUM_OD_VF_CURVE_POINTS ; i++) + size +=sysfs_emit_at (buf, size,"%d: %dmv\n" , + i, + od_table->OverDriveTable.VoltageOffsetPerZoneBoundary[i]); +break ; + +case SMU_OD_RANGE : +if (!smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_GFXCLK_BIT ) && + !smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_UCLK_BIT ) && + !smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_GFX_VF_CURVE_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); + +if (smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_GFXCLK_BIT )) { +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + true, + &min_value, +NULL ); +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + false, +NULL , + &max_value); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , + min_value, max_value); + } + +if (smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_UCLK_BIT )) { +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + true, + &min_value, +NULL ); +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + false, +NULL , + &max_value); + size +=sysfs_emit_at (buf, size,"MCLK: %7uMhz %10uMhz\n" , + min_value, max_value); + } + +if (smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_GFX_VF_CURVE_BIT )) { +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_GFX_VF_CURVE_BIT , + true, + &min_value, + &max_value); + size +=sysfs_emit_at (buf, size,"VDDC_CURVE: %7dmv %10dmv\n" , + min_value, max_value); + } +break ; +default :break ; }
@@ -1171,6 +1356,222 @@ static int smu_v13_0_0_print_clk_levels(struct smu_context *smu,return size; } +static int smu_v13_0_0_od_edit_dpm_table (struct smu_context *smu, +enum PP_OD_DPM_TABLE_COMMAND type, +long input[], +uint32_t size) +{ +struct smu_table_context *table_context = &smu->smu_table; +OverDriveTableExternal_t *od_table = + (OverDriveTableExternal_t *)table_context->overdrive_table; +struct amdgpu_device *adev = smu->adev; +uint32_t offset_of_featurectrlmask; +int32_t minimum, maximum; +uint32_t feature_ctrlmask; +int i, ret =0 ; + +switch (type) { +case PP_OD_EDIT_SCLK_VDDC_TABLE : +if (!smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_GFXCLK_BIT )) { +dev_warn (adev->dev,"GFXCLK_LIMITS setting not supported!\n" ); +return -ENOTSUPP ; + } + +for (i =0 ; i < size; i +=2 ) { +if (i +2 > size) { +dev_info (adev->dev,"invalid number of input parameters %d\n" , size); +return -EINVAL ; + } + +switch (input[i]) { +case 0 : +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + true, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"GfxclkFmin (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.GfxclkFmin = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_GFXCLK_BIT ; +break ; + +case 1 : +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + false, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"GfxclkFmax (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.GfxclkFmax = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_GFXCLK_BIT ; +break ; + +default : +dev_info (adev->dev,"Invalid SCLK_VDDC_TABLE index: %ld\n" , input[i]); +dev_info (adev->dev,"Supported indices: [0:min,1:max]\n" ); +return -EINVAL ; + } + } + +if (od_table->OverDriveTable.GfxclkFmin > od_table->OverDriveTable.GfxclkFmax) { +dev_err (adev->dev, +"Invalid setting: GfxclkFmin(%u) is bigger than GfxclkFmax(%u)\n" , + (uint32_t )od_table->OverDriveTable.GfxclkFmin, + (uint32_t )od_table->OverDriveTable.GfxclkFmax); +return -EINVAL ; + } +break ; + +case PP_OD_EDIT_MCLK_VDDC_TABLE : +if (!smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_UCLK_BIT )) { +dev_warn (adev->dev,"UCLK_LIMITS setting not supported!\n" ); +return -ENOTSUPP ; + } + +for (i =0 ; i < size; i +=2 ) { +if (i +2 > size) { +dev_info (adev->dev,"invalid number of input parameters %d\n" , size); +return -EINVAL ; + } + +switch (input[i]) { +case 0 : +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + true, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"UclkFmin (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.UclkFmin = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_UCLK_BIT ; +break ; + +case 1 : +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + false, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"UclkFmax (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.UclkFmax = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_UCLK_BIT ; +break ; + +default : +dev_info (adev->dev,"Invalid MCLK_VDDC_TABLE index: %ld\n" , input[i]); +dev_info (adev->dev,"Supported indices: [0:min,1:max]\n" ); +return -EINVAL ; + } + } + +if (od_table->OverDriveTable.UclkFmin > od_table->OverDriveTable.UclkFmax) { +dev_err (adev->dev, +"Invalid setting: UclkFmin(%u) is bigger than UclkFmax(%u)\n" , + (uint32_t )od_table->OverDriveTable.UclkFmin, + (uint32_t )od_table->OverDriveTable.UclkFmax); +return -EINVAL ; + } +break ; + +case PP_OD_EDIT_VDDC_CURVE : +if (!smu_v13_0_0_is_od_feature_supported (smu,PP_OD_FEATURE_GFX_VF_CURVE_BIT )) { +dev_warn (adev->dev,"VF curve setting not supported!\n" ); +return -ENOTSUPP ; + } + +if (input[0 ] >=PP_NUM_OD_VF_CURVE_POINTS || + input[0 ] <0 ) +return -EINVAL ; + +smu_v13_0_0_get_od_setting_limits (smu, +PP_OD_FEATURE_GFX_VF_CURVE_BIT , + true, + &minimum, + &maximum); +if (input[1 ] < minimum || + input[1 ] > maximum) { +dev_info (adev->dev,"Voltage offset (%ld) must be within [%d, %d]!\n" , + input[1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.VoltageOffsetPerZoneBoundary[input[0 ]] = input[1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_GFX_VF_CURVE_BIT ; +break ; + +case PP_OD_RESTORE_DEFAULT_TABLE : + feature_ctrlmask = od_table->OverDriveTable.FeatureCtrlMask; +memcpy (od_table, + table_context->boot_overdrive_table, +sizeof (OverDriveTableExternal_t)); + od_table->OverDriveTable.FeatureCtrlMask = feature_ctrlmask; + fallthrough; + +case PP_OD_COMMIT_DPM_TABLE : +/* +* The member below instructs PMFW the settings focused in +* this single operation. +* `uint32_t FeatureCtrlMask;` +* It does not contain actual informations about user's custom +* settings. Thus we do not cache it. +*/ + offset_of_featurectrlmask = offsetof(OverDriveTable_t , FeatureCtrlMask); +if (memcmp (od_table + offset_of_featurectrlmask, + table_context->user_overdrive_table + offset_of_featurectrlmask, +sizeof (OverDriveTableExternal_t) - offset_of_featurectrlmask)) { +smu_v13_0_0_dump_od_table (smu, od_table); + + ret =smu_v13_0_0_upload_overdrive_table (smu, od_table); +if (ret) { +dev_err (adev->dev,"Failed to upload overdrive table!\n" ); +return ret; + } + + od_table->OverDriveTable.FeatureCtrlMask =0 ; +memcpy (table_context->user_overdrive_table + offset_of_featurectrlmask, + od_table + offset_of_featurectrlmask, +sizeof (OverDriveTableExternal_t) - offset_of_featurectrlmask); + +if (!memcmp (table_context->user_overdrive_table, + table_context->boot_overdrive_table, +sizeof (OverDriveTableExternal_t))) + smu->user_dpm_profile.user_od = false; +else + smu->user_dpm_profile.user_od = true; + } +break ; + +default : +return -ENOSYS ; + } + +return ret; +} +static int smu_v13_0_0_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t mask)
@@ -1368,49 +1769,6 @@ static ssize_t smu_v13_0_0_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_3 ); } -static int smu_v13_0_0_get_overdrive_table (struct smu_context *smu, -OverDriveTableExternal_t *od_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; -} - -static int smu_v13_0_0_upload_overdrive_table (struct smu_context *smu, -OverDriveTableExternal_t *od_table) -{ -int ret =0 ; - - ret =smu_cmn_update_table (smu, -SMU_TABLE_OVERDRIVE , -0 , - (void *)od_table, - true); -if (ret) -dev_err (smu->adev->dev,"Failed to upload overdrive table!\n" ); - -return ret; -} - -static void smu_v13_0_0_dump_od_table (struct smu_context *smu, -OverDriveTableExternal_t *od_table) -{ -struct amdgpu_device *adev = smu->adev; - -dev_dbg (adev->dev,"OD: Gfxclk: (%d, %d)\n" , od_table->OverDriveTable.GfxclkFmin, - od_table->OverDriveTable.GfxclkFmax); -dev_dbg (adev->dev,"OD: Uclk: (%d, %d)\n" , od_table->OverDriveTable.UclkFmin, - od_table->OverDriveTable.UclkFmax); -} -static int smu_v13_0_0_set_default_od_settings (struct smu_context *smu) { OverDriveTableExternal_t *od_table =
@@ -2317,6 +2675,7 @@ static const struct pptable_funcs smu_v13_0_0_ppt_funcs = { .set_soft_freq_limited_range = smu_v13_0_set_soft_freq_limited_range, .set_default_od_settings = smu_v13_0_0_set_default_od_settings, .restore_user_od_settings = smu_v13_0_0_restore_user_od_settings, + .od_edit_dpm_table = smu_v13_0_0_od_edit_dpm_table, .init_pptable_microcode = smu_v13_0_init_pptable_microcode, .populate_umd_state_clk = smu_v13_0_0_populate_umd_state_clk, .set_performance_level = smu_v13_0_set_performance_level,
Signature · 1 line
2.34.1
PATCH 4/4 drm/amd/pm: fulfill the OD support for SMU13.0.7
In reply to Evan QuanFulfill the interfaces for OD settings retrieving and setting.
--- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 445 ++++++++++++++++-- 1 file changed, 402 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c +402 -43
@@ -1027,16 +1027,118 @@ static int smu_v13_0_7_get_current_clk_freq_by_table(struct smu_context *smu, value); } +static bool smu_v13_0_7_is_od_feature_supported (struct smu_context *smu, +int od_feature_bit) +{ +PPTable_t *pptable = smu->smu_table.driver_pptable; +const OverDriveLimits_t *const overdrive_upperlimits = + &pptable->SkuTable.OverDriveLimitsBasicMax; + +return overdrive_upperlimits->FeatureCtrlMask & (1U << od_feature_bit); +} + +static void smu_v13_0_7_get_od_setting_limits (struct smu_context *smu, +int od_feature_bit, +bool lower_boundary, +int32_t *min, +int32_t *max) +{ +PPTable_t *pptable = smu->smu_table.driver_pptable; +const OverDriveLimits_t *const overdrive_upperlimits = + &pptable->SkuTable.OverDriveLimitsBasicMax; +const OverDriveLimits_t *const overdrive_lowerlimits = + &pptable->SkuTable.OverDriveLimitsMin; +int32_t od_min_setting, od_max_setting; + +switch (od_feature_bit) { +case PP_OD_FEATURE_GFXCLK_BIT : +if (lower_boundary) { + od_min_setting = overdrive_lowerlimits->GfxclkFmin; + od_max_setting = overdrive_upperlimits->GfxclkFmin; + }else { + od_min_setting = overdrive_lowerlimits->GfxclkFmax; + od_max_setting = overdrive_upperlimits->GfxclkFmax; + } +break ; +case PP_OD_FEATURE_UCLK_BIT : +if (lower_boundary) { + od_min_setting = overdrive_lowerlimits->UclkFmin; + od_max_setting = overdrive_upperlimits->UclkFmin; + }else { + od_min_setting = overdrive_lowerlimits->UclkFmax; + od_max_setting = overdrive_upperlimits->UclkFmax; + } +break ; +case PP_OD_FEATURE_GFX_VF_CURVE_BIT : + od_min_setting = overdrive_lowerlimits->VoltageOffsetPerZoneBoundary; + od_max_setting = overdrive_upperlimits->VoltageOffsetPerZoneBoundary; +break ; +default : +break ; + } + +if (min) + *min = od_min_setting; +if (max) + *max = od_max_setting; +} + +static void smu_v13_0_7_dump_od_table (struct smu_context *smu, +OverDriveTableExternal_t *od_table) +{ +struct amdgpu_device *adev = smu->adev; + +dev_dbg (adev->dev,"OD: Gfxclk: (%d, %d)\n" , od_table->OverDriveTable.GfxclkFmin, + od_table->OverDriveTable.GfxclkFmax); +dev_dbg (adev->dev,"OD: Uclk: (%d, %d)\n" , od_table->OverDriveTable.UclkFmin, + od_table->OverDriveTable.UclkFmax); +} + +static int smu_v13_0_7_get_overdrive_table (struct smu_context *smu, +OverDriveTableExternal_t *od_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; +} + +static int smu_v13_0_7_upload_overdrive_table (struct smu_context *smu, +OverDriveTableExternal_t *od_table) +{ +int ret =0 ; + + ret =smu_cmn_update_table (smu, +SMU_TABLE_OVERDRIVE , +0 , + (void *)od_table, + true); +if (ret) +dev_err (smu->adev->dev,"Failed to upload overdrive table!\n" ); + +return ret; +} +static int smu_v13_0_7_print_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,char *buf) {struct smu_dpm_context *smu_dpm = &smu->smu_dpm;struct smu_13_0_dpm_context *dpm_context = smu_dpm->dpm_context; +OverDriveTableExternal_t *od_table = + (OverDriveTableExternal_t *)smu->smu_table.overdrive_table;struct smu_13_0_dpm_table *single_dpm_table;struct smu_13_0_pcie_table *pcie_table;uint32_t gen_speed, lane_width;int i, curr_freq, size =0 ; +int32_t min_value, max_value;int ret =0 ;smu_cmn_get_sysfs_buf (&buf, &size);
@@ -1153,6 +1255,89 @@ static int smu_v13_0_7_print_clk_levels(struct smu_context *smu, "*" : "");break ; +case SMU_OD_SCLK : +if (!smu_v13_0_7_is_od_feature_supported (smu, +PP_OD_FEATURE_GFXCLK_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"OD_SCLK:\n" ); + size +=sysfs_emit_at (buf, size,"0: %uMhz\n1: %uMhz\n" , + od_table->OverDriveTable.GfxclkFmin, + od_table->OverDriveTable.GfxclkFmax); +break ; + +case SMU_OD_MCLK : +if (!smu_v13_0_7_is_od_feature_supported (smu, +PP_OD_FEATURE_UCLK_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"OD_MCLK:\n" ); + size +=sysfs_emit_at (buf, size,"0: %uMhz\n1: %uMHz\n" , + od_table->OverDriveTable.UclkFmin, + od_table->OverDriveTable.UclkFmax); +break ; + +case SMU_OD_VDDC_CURVE : +if (!smu_v13_0_7_is_od_feature_supported (smu, +PP_OD_FEATURE_GFX_VF_CURVE_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"OD_VDDC_CURVE:\n" ); +for (i =0 ; i <PP_NUM_OD_VF_CURVE_POINTS ; i++) + size +=sysfs_emit_at (buf, size,"%d: %dmv\n" , + i, + od_table->OverDriveTable.VoltageOffsetPerZoneBoundary[i]); +break ; + +case SMU_OD_RANGE : +if (!smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_GFXCLK_BIT ) && + !smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_UCLK_BIT ) && + !smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_GFX_VF_CURVE_BIT )) +break ; + + size +=sysfs_emit_at (buf, size,"%s:\n" ,"OD_RANGE" ); + +if (smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_GFXCLK_BIT )) { +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + true, + &min_value, +NULL ); +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + false, +NULL , + &max_value); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMhz %10uMhz\n" , + min_value, max_value); + } + +if (smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_UCLK_BIT )) { +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + true, + &min_value, +NULL ); +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + false, +NULL , + &max_value); + size +=sysfs_emit_at (buf, size,"MCLK: %7uMhz %10uMhz\n" , + min_value, max_value); + } + +if (smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_GFX_VF_CURVE_BIT )) { +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_GFX_VF_CURVE_BIT , + true, + &min_value, + &max_value); + size +=sysfs_emit_at (buf, size,"VDDC_CURVE: %7dmv %10dmv\n" , + min_value, max_value); + } +break ; +default :break ; }
@@ -1160,6 +1345,222 @@ static int smu_v13_0_7_print_clk_levels(struct smu_context *smu,return size; } +static int smu_v13_0_7_od_edit_dpm_table (struct smu_context *smu, +enum PP_OD_DPM_TABLE_COMMAND type, +long input[], +uint32_t size) +{ +struct smu_table_context *table_context = &smu->smu_table; +OverDriveTableExternal_t *od_table = + (OverDriveTableExternal_t *)table_context->overdrive_table; +struct amdgpu_device *adev = smu->adev; +uint32_t offset_of_featurectrlmask; +int32_t minimum, maximum; +uint32_t feature_ctrlmask; +int i, ret =0 ; + +switch (type) { +case PP_OD_EDIT_SCLK_VDDC_TABLE : +if (!smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_GFXCLK_BIT )) { +dev_warn (adev->dev,"GFXCLK_LIMITS setting not supported!\n" ); +return -ENOTSUPP ; + } + +for (i =0 ; i < size; i +=2 ) { +if (i +2 > size) { +dev_info (adev->dev,"invalid number of input parameters %d\n" , size); +return -EINVAL ; + } + +switch (input[i]) { +case 0 : +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + true, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"GfxclkFmin (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.GfxclkFmin = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_GFXCLK_BIT ; +break ; + +case 1 : +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_GFXCLK_BIT , + false, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"GfxclkFmax (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.GfxclkFmax = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_GFXCLK_BIT ; +break ; + +default : +dev_info (adev->dev,"Invalid SCLK_VDDC_TABLE index: %ld\n" , input[i]); +dev_info (adev->dev,"Supported indices: [0:min,1:max]\n" ); +return -EINVAL ; + } + } + +if (od_table->OverDriveTable.GfxclkFmin > od_table->OverDriveTable.GfxclkFmax) { +dev_err (adev->dev, +"Invalid setting: GfxclkFmin(%u) is bigger than GfxclkFmax(%u)\n" , + (uint32_t )od_table->OverDriveTable.GfxclkFmin, + (uint32_t )od_table->OverDriveTable.GfxclkFmax); +return -EINVAL ; + } +break ; + +case PP_OD_EDIT_MCLK_VDDC_TABLE : +if (!smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_UCLK_BIT )) { +dev_warn (adev->dev,"UCLK_LIMITS setting not supported!\n" ); +return -ENOTSUPP ; + } + +for (i =0 ; i < size; i +=2 ) { +if (i +2 > size) { +dev_info (adev->dev,"invalid number of input parameters %d\n" , size); +return -EINVAL ; + } + +switch (input[i]) { +case 0 : +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + true, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"UclkFmin (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.UclkFmin = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_UCLK_BIT ; +break ; + +case 1 : +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_UCLK_BIT , + false, + &minimum, + &maximum); +if (input[i +1 ] < minimum || + input[i +1 ] > maximum) { +dev_info (adev->dev,"UclkFmax (%ld) must be within [%u, %u]!\n" , + input[i +1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.UclkFmax = input[i +1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_UCLK_BIT ; +break ; + +default : +dev_info (adev->dev,"Invalid MCLK_VDDC_TABLE index: %ld\n" , input[i]); +dev_info (adev->dev,"Supported indices: [0:min,1:max]\n" ); +return -EINVAL ; + } + } + +if (od_table->OverDriveTable.UclkFmin > od_table->OverDriveTable.UclkFmax) { +dev_err (adev->dev, +"Invalid setting: UclkFmin(%u) is bigger than UclkFmax(%u)\n" , + (uint32_t )od_table->OverDriveTable.UclkFmin, + (uint32_t )od_table->OverDriveTable.UclkFmax); +return -EINVAL ; + } +break ; + +case PP_OD_EDIT_VDDC_CURVE : +if (!smu_v13_0_7_is_od_feature_supported (smu,PP_OD_FEATURE_GFX_VF_CURVE_BIT )) { +dev_warn (adev->dev,"VF curve setting not supported!\n" ); +return -ENOTSUPP ; + } + +if (input[0 ] >=PP_NUM_OD_VF_CURVE_POINTS || + input[0 ] <0 ) +return -EINVAL ; + +smu_v13_0_7_get_od_setting_limits (smu, +PP_OD_FEATURE_GFX_VF_CURVE_BIT , + true, + &minimum, + &maximum); +if (input[1 ] < minimum || + input[1 ] > maximum) { +dev_info (adev->dev,"Voltage offset (%ld) must be within [%d, %d]!\n" , + input[1 ], minimum, maximum); +return -EINVAL ; + } + + od_table->OverDriveTable.VoltageOffsetPerZoneBoundary[input[0 ]] = input[1 ]; + od_table->OverDriveTable.FeatureCtrlMask |=1U <<PP_OD_FEATURE_GFX_VF_CURVE_BIT ; +break ; + +case PP_OD_RESTORE_DEFAULT_TABLE : + feature_ctrlmask = od_table->OverDriveTable.FeatureCtrlMask; +memcpy (od_table, + table_context->boot_overdrive_table, +sizeof (OverDriveTableExternal_t)); + od_table->OverDriveTable.FeatureCtrlMask = feature_ctrlmask; + fallthrough; + +case PP_OD_COMMIT_DPM_TABLE : +/* +* The member below instructs PMFW the settings focused in +* this single operation. +* `uint32_t FeatureCtrlMask;` +* It does not contain actual informations about user's custom +* settings. Thus we do not cache it. +*/ + offset_of_featurectrlmask = offsetof(OverDriveTable_t , FeatureCtrlMask); +if (memcmp (od_table + offset_of_featurectrlmask, + table_context->user_overdrive_table + offset_of_featurectrlmask, +sizeof (OverDriveTableExternal_t) - offset_of_featurectrlmask)) { +smu_v13_0_7_dump_od_table (smu, od_table); + + ret =smu_v13_0_7_upload_overdrive_table (smu, od_table); +if (ret) { +dev_err (adev->dev,"Failed to upload overdrive table!\n" ); +return ret; + } + + od_table->OverDriveTable.FeatureCtrlMask =0 ; +memcpy (table_context->user_overdrive_table + offset_of_featurectrlmask, + od_table + offset_of_featurectrlmask, +sizeof (OverDriveTableExternal_t) - offset_of_featurectrlmask); + +if (!memcmp (table_context->user_overdrive_table, + table_context->boot_overdrive_table, +sizeof (OverDriveTableExternal_t))) + smu->user_dpm_profile.user_od = false; +else + smu->user_dpm_profile.user_od = true; + } +break ; + +default : +return -ENOSYS ; + } + +return ret; +} +static int smu_v13_0_7_force_clk_levels (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t mask)
@@ -1354,49 +1755,6 @@ static ssize_t smu_v13_0_7_get_gpu_metrics(struct smu_context *smu,return sizeof (struct gpu_metrics_v1_3 ); } -static int smu_v13_0_7_get_overdrive_table (struct smu_context *smu, -OverDriveTableExternal_t *od_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; -} - -static int smu_v13_0_7_upload_overdrive_table (struct smu_context *smu, -OverDriveTableExternal_t *od_table) -{ -int ret =0 ; - - ret =smu_cmn_update_table (smu, -SMU_TABLE_OVERDRIVE , -0 , - (void *)od_table, - true); -if (ret) -dev_err (smu->adev->dev,"Failed to upload overdrive table!\n" ); - -return ret; -} - -static void smu_v13_0_7_dump_od_table (struct smu_context *smu, -OverDriveTableExternal_t *od_table) -{ -struct amdgpu_device *adev = smu->adev; - -dev_dbg (adev->dev,"OD: Gfxclk: (%d, %d)\n" , od_table->OverDriveTable.GfxclkFmin, - od_table->OverDriveTable.GfxclkFmax); -dev_dbg (adev->dev,"OD: Uclk: (%d, %d)\n" , od_table->OverDriveTable.UclkFmin, - od_table->OverDriveTable.UclkFmax); -} -static int smu_v13_0_7_set_default_od_settings (struct smu_context *smu) { OverDriveTableExternal_t *od_table =
@@ -1925,6 +2283,7 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = { .set_soft_freq_limited_range = smu_v13_0_set_soft_freq_limited_range, .set_default_od_settings = smu_v13_0_7_set_default_od_settings, .restore_user_od_settings = smu_v13_0_7_restore_user_od_settings, + .od_edit_dpm_table = smu_v13_0_7_od_edit_dpm_table, .set_performance_level = smu_v13_0_set_performance_level, .gfx_off_control = smu_v13_0_gfx_off_control, .get_fan_speed_pwm = smu_v13_0_7_get_fan_speed_pwm,
Signature · 1 line
2.34.1
Series is:
Quoted 28 lines · Evan Quan
Enable the following OD features support for SMU13:
- Maxinum and minimum gfxclk frequency settings
- Maxinum and minimum uclk frequency settings
- Voltage offset settings for gfxclk v/f curve line
- This is quite different from previous generations/ASICs. For SMU13, there are six anchor points defined on the v/f curve. And what user configurable are the voltage offsets for those anchor points.Evan Quan (4):
drm/amd/pm: update SMU13 header files for coming OD support drm/amd/pm: fulfill SMU13 OD settings init and restore drm/amd/pm: fulfill the OD support for SMU13.0.0 drm/amd/pm: fulfill the OD support for SMU13.0.7drivers/gpu/drm/amd/pm/amdgpu_pm.c | 26 +- .../gpu/drm/amd/pm/inc/smu_v13_0_0_pptable.h | 16 +- .../inc/pmfw_if/smu13_driver_if_v13_0_0.h | 18 +- .../inc/pmfw_if/smu13_driver_if_v13_0_7.h | 29 +- .../amd/pm/swsmu/inc/smu_v13_0_7_pptable.h | 16 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 13 +- .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 488 +++++++++++++++++- .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 487 ++++++++++++++++- 8 files changed, 1038 insertions(+), 55 deletions(-)--
2.34.1