drm/amd/powerplay: update OD feature judgement
Subsystems (2)
PATCH 1/3 drm/amd/powerplay: update OD feature judgement
Update the conditions to judge whether an OD feature should be supported on vega20.
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 81 +++++++++++++------ .../drm/amd/powerplay/hwmgr/vega20_pptable.h | 2 + 2 files changed, 57 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +55 -26
@@ -47,6 +47,8 @@#include "pp_overdriver.h" #include "pp_thermal.h" +#define VOLTAGE_SCALE 4 +static void vega20_set_default_registry_data (struct pp_hwmgr *hwmgr) { struct vega20_hwmgr *data =
@@ -832,58 +834,85 @@ static int vega20_od8_set_feature_capabilities(struct phm_ppt_v3_information *pptable_information = (struct phm_ppt_v3_information *)hwmgr->pptable;struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +PPTable_t *pp_table = &(data->smc_state_table.pp_table);struct vega20_od8_settings *od_settings = &(data->od8_settings); od_settings->overdrive8_capabilities =0 ;if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { -if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_GFXCLKFMAX ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_GFXCLKFMAX ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_GFXCLKFMIN ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_GFXCLKFMIN ] >0 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_GFXCLK_LIMITS ] && + pptable_information->od_settings_max[OD8_SETTING_GFXCLK_FMAX ] >0 && + pptable_information->od_settings_min[OD8_SETTING_GFXCLK_FMIN ] >0 && + (pptable_information->od_settings_max[OD8_SETTING_GFXCLK_FMAX ] >= + pptable_information->od_settings_min[OD8_SETTING_GFXCLK_FMIN ])) od_settings->overdrive8_capabilities |=OD8_GFXCLK_LIMITS ; -if (pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1 ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2 ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3 ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1 ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2 ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3 ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P1 ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P2 ] >0 && - pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P3 ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P1 ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P2 ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOFFSET_P3 ] >0 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_GFXCLK_CURVE ] && + (pptable_information->od_settings_min[OD8_SETTING_GFXCLK_VOLTAGE1 ] >= + pp_table->MinVoltageGfx /VOLTAGE_SCALE ) && + (pptable_information->od_settings_max[OD8_SETTING_GFXCLK_VOLTAGE3 ] <= + pp_table->MaxVoltageGfx /VOLTAGE_SCALE ) && + (pptable_information->od_settings_max[OD8_SETTING_GFXCLK_VOLTAGE3 ] >= + pptable_information->od_settings_min[OD8_SETTING_GFXCLK_VOLTAGE1 ])) od_settings->overdrive8_capabilities |=OD8_GFXCLK_CURVE ; }if (data->smu_features[GNLD_DPM_UCLK ].enabled) { -if (pptable_information->od_settings_min[ATOM_VEGA20_ODSETTING_UCLKFMAX ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_UCLKFMAX ] >0 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_UCLK_MAX ] && + pptable_information->od_settings_min[OD8_SETTING_UCLK_FMAX ] >0 && + pptable_information->od_settings_max[OD8_SETTING_UCLK_FMAX ] >0 && + (pptable_information->od_settings_max[OD8_SETTING_UCLK_FMAX ] >= + pptable_information->od_settings_min[OD8_SETTING_UCLK_FMAX ])) od_settings->overdrive8_capabilities |=OD8_UCLK_MAX ; } -if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE ] >0 && - pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE ] <=100 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_POWER_LIMIT ] && + pptable_information->od_settings_max[OD8_SETTING_POWER_PERCENTAGE ] >0 && + pptable_information->od_settings_max[OD8_SETTING_POWER_PERCENTAGE ] <=100 && + pptable_information->od_settings_min[OD8_SETTING_POWER_PERCENTAGE ] >0 && + pptable_information->od_settings_min[OD8_SETTING_POWER_PERCENTAGE ] <=100 ) od_settings->overdrive8_capabilities |=OD8_POWER_LIMIT ;if (data->smu_features[GNLD_FAN_CONTROL ].enabled) { -if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_FANRPMMIN ] >0 ) - od_settings->overdrive8_capabilities |=OD8_FAN_SPEED_MIN ; - -if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_FANRPMACOUSTICLIMIT ] >0 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_FAN_ACOUSTIC_LIMIT ] && + pptable_information->od_settings_min[OD8_SETTING_FAN_ACOUSTIC_LIMIT ] >0 && + pptable_information->od_settings_max[OD8_SETTING_FAN_ACOUSTIC_LIMIT ] >0 && + (pptable_information->od_settings_max[OD8_SETTING_FAN_ACOUSTIC_LIMIT ] >= + pptable_information->od_settings_min[OD8_SETTING_FAN_ACOUSTIC_LIMIT ])) od_settings->overdrive8_capabilities |=OD8_ACOUSTIC_LIMIT_SCLK ; + +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_FAN_SPEED_MIN ] && + (pptable_information->od_settings_min[OD8_SETTING_FAN_MIN_SPEED ] >= + (pp_table->FanPwmMin * pp_table->FanMaximumRpm /100 )) && + pptable_information->od_settings_max[OD8_SETTING_FAN_MIN_SPEED ] >0 && + (pptable_information->od_settings_max[OD8_SETTING_FAN_MIN_SPEED ] >= + pptable_information->od_settings_min[OD8_SETTING_FAN_MIN_SPEED ])) + od_settings->overdrive8_capabilities |=OD8_FAN_SPEED_MIN ; }if (data->smu_features[GNLD_THERMAL ].enabled) { -if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_FANTARGETTEMPERATURE ] >0 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_TEMPERATURE_FAN ] && + pptable_information->od_settings_max[OD8_SETTING_FAN_TARGET_TEMP ] >0 && + pptable_information->od_settings_min[OD8_SETTING_FAN_TARGET_TEMP ] >0 && + (pptable_information->od_settings_max[OD8_SETTING_FAN_TARGET_TEMP ] >= + pptable_information->od_settings_min[OD8_SETTING_FAN_TARGET_TEMP ])) od_settings->overdrive8_capabilities |=OD8_TEMPERATURE_FAN ; -if (pptable_information->od_settings_max[ATOM_VEGA20_ODSETTING_OPERATINGTEMPMAX ] >0 ) +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_TEMPERATURE_SYSTEM ] && + pptable_information->od_settings_max[OD8_SETTING_OPERATING_TEMP_MAX ] >0 && + pptable_information->od_settings_min[OD8_SETTING_OPERATING_TEMP_MAX ] >0 && + (pptable_information->od_settings_max[OD8_SETTING_OPERATING_TEMP_MAX ] >= + pptable_information->od_settings_min[OD8_SETTING_OPERATING_TEMP_MAX ])) od_settings->overdrive8_capabilities |=OD8_TEMPERATURE_SYSTEM ; } +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_MEMORY_TIMING_TUNE ]) + od_settings->overdrive8_capabilities |=OD8_MEMORY_TIMING_TUNE ; + +if (pptable_information->od_feature_capabilities[ATOM_VEGA20_ODFEATURE_FAN_ZERO_RPM_CONTROL ] && + pp_table->FanZeroRpmEnable) + od_settings->overdrive8_capabilities |=OD8_FAN_ZERO_RPM_CONTROL ; +return 0 ; }
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h +2 -0
@@ -49,6 +49,8 @@ enum ATOM_VEGA20_ODFEATURE_ID {ATOM_VEGA20_ODFEATURE_FAN_SPEED_MIN ,//FanMinimumPwm ATOM_VEGA20_ODFEATURE_TEMPERATURE_FAN ,//FanTargetTemperature ATOM_VEGA20_ODFEATURE_TEMPERATURE_SYSTEM ,//MaxOpTemp +ATOM_VEGA20_ODFEATURE_MEMORY_TIMING_TUNE , +ATOM_VEGA20_ODFEATURE_FAN_ZERO_RPM_CONTROL , ATOM_VEGA20_ODFEATURE_COUNT, };
Signature · 6 lines
2.19.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 2/3 drm/amd/powerplay: update OD to take voltage value instead of offset
With the latest SMC fw, we are able to get the voltage value for specific frequency point. So, we update the OD relates to take absolute voltage instead of offset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 +- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 112 +++++++++++++----- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 4 + .../drm/amd/powerplay/inc/smu11_driver_if.h | 6 +- .../gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 3 +- 5 files changed, 96 insertions(+), 41 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +6 -6
@@ -502,7 +502,7 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* * - maximum memory clock labeled OD_MCLK * -* - three <frequency, voltage offset> points labeled OD_VDDC_CURVE. +* - three <frequency, voltage> points labeled OD_VDDC_CURVE. * They can be used to calibrate the sclk voltage curve. * * - a list of valid ranges for sclk, mclk, and voltage curve points
@@ -519,11 +519,11 @@ static ssize_t amdgpu_set_pp_table(struct device *dev,* "m 1 800" will update maximum mclk to be 800Mhz. * * For sclk voltage curve, enter the new values by writing a -* string that contains "vc point clock voff" to the file. The -* points are indexed by 0, 1 and 2. E.g., "vc 0 300 10" will -* update point1 with clock set as 300Mhz and voltage increased -* by 10mV. "vc 2 1000 -10" will update point3 with clock set -* as 1000Mhz and voltage drop by 10mV. +* 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. * * - When you have edited all of the states as needed, write "c" (commit) * to the file to commit your changes
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +81 -31
212 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h +4 -0
@@ -38,6 +38,10 @@#define VG20_PSUEDO_NUM_DCEFCLK_DPM_LEVELS 8#define VG20_PSUEDO_NUM_UCLK_DPM_LEVELS 4 +//OverDriver8 macro defs +#define AVFS_CURVE 0 +#define OD8_HOTCURVE_TEMPERATURE 85 +typedef uint32_t PP_Clock ;enum {
drivers/gpu/drm/amd/powerplay/inc/smu11_driver_if.h +3 -3
@@ -569,11 +569,11 @@ typedef struct {uint16_t GfxclkFmin;uint16_t GfxclkFmax;uint16_t GfxclkFreq1; -int16_t GfxclkOffsetVolt1; +uint16_t GfxclkVolt1;uint16_t GfxclkFreq2; -int16_t GfxclkOffsetVolt2; +uint16_t GfxclkVolt2;uint16_t GfxclkFreq3; -int16_t GfxclkOffsetVolt3; +uint16_t GfxclkVolt3;uint16_t UclkFmax;int16_t OverDrivePct;uint16_t FanMaximumRpm;
drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h +2 -1
@@ -117,7 +117,8 @@#define PPSMC_MSG_PrepareMp1ForReset 0x59#define PPSMC_MSG_PrepareMp1ForShutdown 0x5A#define PPSMC_MSG_SetMGpuFanBoostLimitRpm 0x5D -#define PPSMC_Message_Count 0x5E +#define PPSMC_MSG_GetAVFSVoltageByDpm 0x5F +#define PPSMC_Message_Count 0x60typedef uint32_t PPSMC_Result ;typedef uint32_t PPSMC_Msg ;
Signature · 6 lines
2.19.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/powerplay: retrieve the updated clock table after OD
In reply to a message not in the archiveWith OD settings applied, the clock table will be updated accordingly. We need to retrieve the new clock tables then.
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 114 ++++++++++++++---- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 2 + 2 files changed, 90 insertions(+), 26 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +88 -26
@@ -516,6 +516,47 @@ static int vega20_setup_single_dpm_table(struct pp_hwmgr *hwmgr,return ret; } +static int vega20_setup_gfxclk_dpm_table (struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_single_dpm_table *dpm_table; +int ret =0 ; + + dpm_table = &(data->dpm_table.gfx_table); +if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { + ret =vega20_setup_single_dpm_table (hwmgr, dpm_table,PPCLK_GFXCLK ); +PP_ASSERT_WITH_CODE (!ret, +"[SetupDefaultDpmTable] failed to get gfxclk dpm levels!" , + return ret); + }else { + dpm_table->count =1 ; + dpm_table->dpm_levels[0 ].value = data->vbios_boot_state.gfx_clock /100 ; + } + +return ret; +} + +static int vega20_setup_memclk_dpm_table (struct pp_hwmgr *hwmgr) +{ +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_single_dpm_table *dpm_table; +int ret =0 ; + + dpm_table = &(data->dpm_table.mem_table); +if (data->smu_features[GNLD_DPM_UCLK ].enabled) { + ret =vega20_setup_single_dpm_table (hwmgr, dpm_table,PPCLK_UCLK ); +PP_ASSERT_WITH_CODE (!ret, +"[SetupDefaultDpmTable] failed to get memclk dpm levels!" , + return ret); + }else { + dpm_table->count =1 ; + dpm_table->dpm_levels[0 ].value = data->vbios_boot_state.mem_clock /100 ; + } + +return ret; +}/* * This function is to initialize all DPM state tables
@@ -549,28 +590,16 @@ static int vega20_setup_default_dpm_tables(struct pp_hwmgr *hwmgr)/* gfxclk */ dpm_table = &(data->dpm_table.gfx_table); -if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { - ret =vega20_setup_single_dpm_table (hwmgr, dpm_table,PPCLK_GFXCLK ); -PP_ASSERT_WITH_CODE (!ret, -"[SetupDefaultDpmTable] failed to get gfxclk dpm levels!" , - return ret); - }else { - dpm_table->count =1 ; - dpm_table->dpm_levels[0 ].value = data->vbios_boot_state.gfx_clock /100 ; - } + ret =vega20_setup_gfxclk_dpm_table (hwmgr); +if (ret) +return ret;vega20_init_dpm_state (&(dpm_table->dpm_state));/* memclk */ dpm_table = &(data->dpm_table.mem_table); -if (data->smu_features[GNLD_DPM_UCLK ].enabled) { - ret =vega20_setup_single_dpm_table (hwmgr, dpm_table,PPCLK_UCLK ); -PP_ASSERT_WITH_CODE (!ret, -"[SetupDefaultDpmTable] failed to get memclk dpm levels!" , - return ret); - }else { - dpm_table->count =1 ; - dpm_table->dpm_levels[0 ].value = data->vbios_boot_state.mem_clock /100 ; - } + ret =vega20_setup_memclk_dpm_table (hwmgr); +if (ret) +return ret;vega20_init_dpm_state (&(dpm_table->dpm_state));/* eclk */
@@ -1183,6 +1212,9 @@ static int vega20_od8_set_settings( {OverDriveTable_t od_table;int ret =0 ; +struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); +struct vega20_od8_single_setting *od8_settings = + data->od8_settings.od8_settings_array; ret =vega20_copy_table_from_smc (hwmgr, (uint8_t *)(&od_table),TABLE_OVERDRIVE ); PP_ASSERT_WITH_CODE(!ret,
@@ -1194,6 +1226,10 @@ static int vega20_od8_set_settings( od_table.GfxclkFmin = (uint16_t )value;break ;case OD8_SETTING_GFXCLK_FMAX : +if (value < od8_settings[OD8_SETTING_GFXCLK_FMAX ].min_value || + value > od8_settings[OD8_SETTING_GFXCLK_FMAX ].max_value) +return -EINVAL ; + od_table.GfxclkFmax = (uint16_t )value;break ;case OD8_SETTING_GFXCLK_FREQ1 :
@@ -1215,6 +1251,9 @@ static int vega20_od8_set_settings( od_table.GfxclkVolt3 = (uint16_t )value;break ;case OD8_SETTING_UCLK_FMAX : +if (value < od8_settings[OD8_SETTING_UCLK_FMAX ].min_value || + value > od8_settings[OD8_SETTING_UCLK_FMAX ].max_value) +return -EINVAL ; od_table.UclkFmax = (uint16_t )value;break ;case OD8_SETTING_POWER_PERCENTAGE :
@@ -1264,8 +1303,6 @@ static int vega20_set_sclk_od( struct pp_hwmgr *hwmgr, uint32_t value) {struct vega20_hwmgr *data = hwmgr->backend; -struct vega20_single_dpm_table *sclk_table = - &(data->dpm_table.gfx_table);struct vega20_single_dpm_table *golden_sclk_table = &(data->golden_dpm_table.gfx_table);uint32_t od_sclk;
@@ -1280,8 +1317,8 @@ static int vega20_set_sclk_od("[SetSclkOD] failed to set od gfxclk!" , return ret); -/* refresh gfxclk table */ - ret =vega20_setup_single_dpm_table (hwmgr, sclk_table,PPCLK_GFXCLK ); +/* retrieve updated gfxclk table */ + ret =vega20_setup_gfxclk_dpm_table (hwmgr);PP_ASSERT_WITH_CODE (!ret,"[SetSclkOD] failed to refresh gfxclk table!" , return ret);
@@ -1311,8 +1348,6 @@ static int vega20_set_mclk_od( struct pp_hwmgr *hwmgr, uint32_t value) {struct vega20_hwmgr *data = hwmgr->backend; -struct vega20_single_dpm_table *mclk_table = - &(data->dpm_table.mem_table);struct vega20_single_dpm_table *golden_mclk_table = &(data->golden_dpm_table.mem_table);uint32_t od_mclk;
@@ -1327,8 +1362,8 @@ static int vega20_set_mclk_od("[SetMclkOD] failed to set od memclk!" , return ret); -/* refresh memclk table */ - ret =vega20_setup_single_dpm_table (hwmgr, mclk_table,PPCLK_UCLK ); +/* retrieve updated memclk table */ + ret =vega20_setup_memclk_dpm_table (hwmgr);PP_ASSERT_WITH_CODE (!ret,"[SetMclkOD] failed to refresh memclk table!" , return ret);
@@ -2467,6 +2502,10 @@ static int vega20_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,return -EINVAL ; } +if ((input_index ==0 && od_table->GfxclkFmin != input_clk) || + (input_index ==1 && od_table->GfxclkFmax != input_clk)) + data->gfxclk_overdrive = true; +if (input_index ==0 ) od_table->GfxclkFmin = input_clk;else
@@ -2511,6 +2550,9 @@ static int vega20_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,return -EINVAL ; } +if (input_index ==1 && od_table->UclkFmax != input_clk) + data->memclk_overdrive = true; + od_table->UclkFmax = input_clk; }
@@ -2583,6 +2625,9 @@ static int vega20_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,break ;case PP_OD_RESTORE_DEFAULT_TABLE : + data->gfxclk_overdrive = false; + data->memclk_overdrive = false; + ret =vega20_copy_table_from_smc (hwmgr, (uint8_t *)od_table,TABLE_OVERDRIVE );
@@ -2599,6 +2644,23 @@ static int vega20_odn_edit_dpm_table(struct pp_hwmgr *hwmgr,"Failed to import overdrive table!" , return ret); +/* retrieve updated gfxclk table */ +if (data->gfxclk_overdrive) { + data->gfxclk_overdrive = false; + + ret =vega20_setup_gfxclk_dpm_table (hwmgr); +if (ret) +return ret; + } + +/* retrieve updated memclk table */ +if (data->memclk_overdrive) { + data->memclk_overdrive = false; + + ret =vega20_setup_memclk_dpm_table (hwmgr); +if (ret) +return ret; + }break ;default :
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h +2 -0
@@ -502,6 +502,8 @@ struct vega20_hwmgr {/* ---- Overdrive next setting ---- */ struct vega20_odn_data odn_data; +bool gfxclk_overdrive; +bool memclk_overdrive;/* ---- Overdrive8 Setting ---- */ struct vega20_od8_settings od8_settings;
Signature · 6 lines
2.19.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Acked-by Alex DeucherQuoted 8 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Monday, September 17, 2018 3:14 AM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 1/3] drm/amd/powerplay: update OD feature judgement
Quoted 5 lines
Update the conditions to judge whether an OD feature should be supported on vega20.
Change-Id Iaabdd4db8f685fb94c960263fe38a21b36377aa2Signed-off-by Evan Quan <[email protected]>
Series is:
Quoted 255 lines
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 81 +++++++++++++--- --- .../drm/amd/powerplay/hwmgr/vega20_pptable.h | 2 + 2 files changed, 57 insertions(+), 26 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +3
-1@@ -47,6 +47,8 @@#include "pp_overdriver.h" #include "pp_thermal.h" +#define VOLTAGE_SCALE 4 +static void vega20_set_default_registry_data (struct pp_hwmgr *hwmgr) { struct vega20_hwmgr *data =@@ -832,58 +834,85 @@ static int vega20_od8_set_feature_capabilities(struct phm_ppt_v3_information *pptable_information = (struct phm_ppt_v3_information *)hwmgr->pptable;struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr- >backend); +PPTable_t *pp_table = &(data->smc_state_table.pp_table);struct vega20_od8_settings *od_settings = &(data->od8_settings); od_settings->overdrive8_capabilities =0 ;if (data->smu_features[GNLD_DPM_GFXCLK ].enabled) { - if (pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_GFXCLKFMAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_GFXCLKFMAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_GFXCLKFMIN] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_GFXCLKFMIN] > 0)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_GFXCLK_LIMITS] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_GFXCLK_FMAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_GFXCLK_FMIN] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_GFXCLK_FMAX] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_GFXCLK_FMIN]))
od_settings->overdrive8_capabilities|=OD8_GFXCLK_LIMITS;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- if (pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1] >
0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2] >
0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3] >
0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P1] >
0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P2] >
0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEFREQ_P3] >
0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOF
FSET_P1] > 0 &&drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOF
FSET_P2] > 0 &&drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEOF
FSET_P3] > 0 &&drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEO
FFSET_P1] > 0 &&drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEO
FFSET_P2] > 0 &&drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_VDDGFXCURVEVOLTAGEO
FFSET_P3] > 0)drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_GFXCLK_CURVE] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_GFXCLK_VOLTAGE1] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ pp_table->MinVoltageGfx / VOLTAGE_SCALE) && + (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_GFXCLK_VOLTAGE3] <=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ pp_table->MaxVoltageGfx / VOLTAGE_SCALE) && + (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_GFXCLK_VOLTAGE3] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ +pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_GFXCLK_VOLTAGE1]))
od_settings->overdrive8_capabilities|=OD8_GFXCLK_CURVE;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1}if (data->smu_features[GNLD_DPM_UCLK ].enabled) { - if (pptable_information-Quoted 1 line
od_settings_min[ATOM_VEGA20_ODSETTING_UCLKFMAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_UCLKFMAX] > 0)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_UCLK_MAX] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_UCLK_FMAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_UCLK_FMAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_UCLK_FMAX] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_UCLK_FMAX]))
od_settings->overdrive8_capabilities|=OD8_UCLK_MAX;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1} - if (pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE] > 0
&&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_POWERPERCENTAGE] <=
100)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_POWER_LIMIT] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_POWER_PERCENTAGE] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_POWER_PERCENTAGE] <= 100 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_POWER_PERCENTAGE] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_POWER_PERCENTAGE]
+<= 100)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1od_settings->overdrive8_capabilities |=OD8_POWER_LIMIT ;if (data->smu_features[GNLD_FAN_CONTROL ].enabled) { - if (pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_FANRPMMIN] > 0)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- od_settings->overdrive8_capabilities |=
OD8_FAN_SPEED_MIN;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-2- - if (pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_FANRPMACOUSTICLIMIT] >
0)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_FAN_ACOUSTIC_LI
MIT] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_FAN_ACOUSTIC_LIMIT] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_FAN_ACOUSTIC_LIMIT] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_FAN_ACOUSTIC_LIMIT] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ +pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_FAN_ACOUSTIC_LIMIT]))
od_settings->overdrive8_capabilities|=OD8_ACOUSTIC_LIMIT_SCLK;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ + if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_FAN_SPEED_MIN]
&&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_FAN_MIN_SPEED] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pp_table->FanPwmMin * pp_table->FanMaximumRpm /100)) &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_FAN_MIN_SPEED] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_FAN_MIN_SPEED] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_FAN_MIN_SPEED]))
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ od_settings->overdrive8_capabilities |=
OD8_FAN_SPEED_MIN;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1}if (data->smu_features[GNLD_THERMAL ].enabled) { - if (pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_FANTARGETTEMPERATURE
] > 0)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_TEMPERATURE_FAN
] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_FAN_TARGET_TEMP] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_FAN_TARGET_TEMP] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_FAN_TARGET_TEMP] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ +pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_FAN_TARGET_TEMP]))
od_settings->overdrive8_capabilities|=OD8_TEMPERATURE_FAN;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +0
-1- if (pptable_information-Quoted 1 line
od_settings_max[ATOM_VEGA20_ODSETTING_OPERATINGTEMPMAX] >
0)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_TEMPERATURE_SYS
TEM] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_OPERATING_TEMP_MAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_OPERATING_TEMP_MAX] > 0 &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ (pptable_information-Quoted 1 line
od_settings_max[OD8_SETTING_OPERATING_TEMP_MAX] >=
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ +pptable_information-Quoted 1 line
od_settings_min[OD8_SETTING_OPERATING_TEMP_MAX]))
od_settings->overdrive8_capabilities|=OD8_TEMPERATURE_SYSTEM;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0} + if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_MEMORY_TIMING_
TUNE])
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+ od_settings->overdrive8_capabilities |=
OD8_MEMORY_TIMING_TUNE;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ + if (pptable_information-Quoted 1 line
od_feature_capabilities[ATOM_VEGA20_ODFEATURE_FAN_ZERO_RPM_C
ONTROL] &&
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +2
-0+ pp_table->FanZeroRpmEnable) + od_settings->overdrive8_capabilities |=
OD8_FAN_ZERO_RPM_CONTROL;drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +1
-0+return 0 ; }drivers/gpu/drm/amd/powerplay/hwmgr/vega20_pptable.h +2
-1@@ -49,6 +49,8 @@ enum ATOM_VEGA20_ODFEATURE_ID {ATOM_VEGA20_ODFEATURE_FAN_SPEED_MIN ,//FanMinimumPwm ATOM_VEGA20_ODFEATURE_TEMPERATURE_FAN ,//FanTargetTemperature ATOM_VEGA20_ODFEATURE_TEMPERATURE_SYSTEM ,//MaxOpTemp +ATOM_VEGA20_ODFEATURE_MEMORY_TIMING_TUNE , +ATOM_VEGA20_ODFEATURE_FAN_ZERO_RPM_CONTROL , ATOM_VEGA20_ODFEATURE_COUNT, }; --2.19.0
Quoted 4 lines
_______________________________________________
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