Commit c1f2fb6b authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher

drm/amd/pp: Delete unnecessary function argument

in populate_single_graphic_level for smu7
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c7429b3a
...@@ -411,8 +411,7 @@ static uint8_t ci_get_sleep_divider_id_from_clock(uint32_t clock, ...@@ -411,8 +411,7 @@ static uint8_t ci_get_sleep_divider_id_from_clock(uint32_t clock,
} }
static int ci_populate_single_graphic_level(struct pp_hwmgr *hwmgr, static int ci_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
uint32_t clock, uint16_t sclk_al_threshold, uint32_t clock, struct SMU7_Discrete_GraphicsLevel *level)
struct SMU7_Discrete_GraphicsLevel *level)
{ {
int result; int result;
struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend); struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
...@@ -438,7 +437,7 @@ static int ci_populate_single_graphic_level(struct pp_hwmgr *hwmgr, ...@@ -438,7 +437,7 @@ static int ci_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
clock, clock,
&level->MinVddcPhases); &level->MinVddcPhases);
level->ActivityLevel = sclk_al_threshold; level->ActivityLevel = data->current_profile_setting.sclk_activity;
level->CcPwrDynRm = 0; level->CcPwrDynRm = 0;
level->CcPwrDynRm1 = 0; level->CcPwrDynRm1 = 0;
level->EnabledForActivity = 0; level->EnabledForActivity = 0;
...@@ -492,7 +491,6 @@ static int ci_populate_all_graphic_levels(struct pp_hwmgr *hwmgr) ...@@ -492,7 +491,6 @@ static int ci_populate_all_graphic_levels(struct pp_hwmgr *hwmgr)
for (i = 0; i < dpm_table->sclk_table.count; i++) { for (i = 0; i < dpm_table->sclk_table.count; i++) {
result = ci_populate_single_graphic_level(hwmgr, result = ci_populate_single_graphic_level(hwmgr,
dpm_table->sclk_table.dpm_levels[i].value, dpm_table->sclk_table.dpm_levels[i].value,
data->current_profile_setting.sclk_activity,
&levels[i]); &levels[i]);
if (result) if (result)
return result; return result;
......
...@@ -968,8 +968,7 @@ static int fiji_calculate_sclk_params(struct pp_hwmgr *hwmgr, ...@@ -968,8 +968,7 @@ static int fiji_calculate_sclk_params(struct pp_hwmgr *hwmgr,
} }
static int fiji_populate_single_graphic_level(struct pp_hwmgr *hwmgr, static int fiji_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
uint32_t clock, uint16_t sclk_al_threshold, uint32_t clock, struct SMU73_Discrete_GraphicsLevel *level)
struct SMU73_Discrete_GraphicsLevel *level)
{ {
int result; int result;
/* PP_Clocks minClocks; */ /* PP_Clocks minClocks; */
...@@ -996,7 +995,7 @@ static int fiji_populate_single_graphic_level(struct pp_hwmgr *hwmgr, ...@@ -996,7 +995,7 @@ static int fiji_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
return result); return result);
level->SclkFrequency = clock; level->SclkFrequency = clock;
level->ActivityLevel = sclk_al_threshold; level->ActivityLevel = data->current_profile_setting.sclk_activity;
level->CcPwrDynRm = 0; level->CcPwrDynRm = 0;
level->CcPwrDynRm1 = 0; level->CcPwrDynRm1 = 0;
level->EnabledForActivity = 0; level->EnabledForActivity = 0;
...@@ -1059,7 +1058,6 @@ static int fiji_populate_all_graphic_levels(struct pp_hwmgr *hwmgr) ...@@ -1059,7 +1058,6 @@ static int fiji_populate_all_graphic_levels(struct pp_hwmgr *hwmgr)
for (i = 0; i < dpm_table->sclk_table.count; i++) { for (i = 0; i < dpm_table->sclk_table.count; i++) {
result = fiji_populate_single_graphic_level(hwmgr, result = fiji_populate_single_graphic_level(hwmgr,
dpm_table->sclk_table.dpm_levels[i].value, dpm_table->sclk_table.dpm_levels[i].value,
data->current_profile_setting.sclk_activity,
&levels[i]); &levels[i]);
if (result) if (result)
return result; return result;
......
...@@ -894,7 +894,6 @@ static int iceland_populate_phase_value_based_on_sclk(struct pp_hwmgr *hwmgr, ...@@ -894,7 +894,6 @@ static int iceland_populate_phase_value_based_on_sclk(struct pp_hwmgr *hwmgr,
static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr, static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
uint32_t engine_clock, uint32_t engine_clock,
uint16_t sclk_activity_level_threshold,
SMU71_Discrete_GraphicsLevel *graphic_level) SMU71_Discrete_GraphicsLevel *graphic_level)
{ {
int result; int result;
...@@ -920,7 +919,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr, ...@@ -920,7 +919,7 @@ static int iceland_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
&graphic_level->MinVddcPhases); &graphic_level->MinVddcPhases);
/* Indicates maximum activity level for this performance level. 50% for now*/ /* Indicates maximum activity level for this performance level. 50% for now*/
graphic_level->ActivityLevel = sclk_activity_level_threshold; graphic_level->ActivityLevel = data->current_profile_setting.sclk_activity;
graphic_level->CcPwrDynRm = 0; graphic_level->CcPwrDynRm = 0;
graphic_level->CcPwrDynRm1 = 0; graphic_level->CcPwrDynRm1 = 0;
...@@ -985,7 +984,6 @@ static int iceland_populate_all_graphic_levels(struct pp_hwmgr *hwmgr) ...@@ -985,7 +984,6 @@ static int iceland_populate_all_graphic_levels(struct pp_hwmgr *hwmgr)
for (i = 0; i < dpm_table->sclk_table.count; i++) { for (i = 0; i < dpm_table->sclk_table.count; i++) {
result = iceland_populate_single_graphic_level(hwmgr, result = iceland_populate_single_graphic_level(hwmgr,
dpm_table->sclk_table.dpm_levels[i].value, dpm_table->sclk_table.dpm_levels[i].value,
data->current_profile_setting.sclk_activity,
&(smu_data->smc_state_table.GraphicsLevel[i])); &(smu_data->smc_state_table.GraphicsLevel[i]));
if (result != 0) if (result != 0)
return result; return result;
......
...@@ -934,8 +934,7 @@ static int polaris10_calculate_sclk_params(struct pp_hwmgr *hwmgr, ...@@ -934,8 +934,7 @@ static int polaris10_calculate_sclk_params(struct pp_hwmgr *hwmgr,
} }
static int polaris10_populate_single_graphic_level(struct pp_hwmgr *hwmgr, static int polaris10_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
uint32_t clock, uint16_t sclk_al_threshold, uint32_t clock, struct SMU74_Discrete_GraphicsLevel *level)
struct SMU74_Discrete_GraphicsLevel *level)
{ {
int result; int result;
/* PP_Clocks minClocks; */ /* PP_Clocks minClocks; */
...@@ -962,7 +961,7 @@ static int polaris10_populate_single_graphic_level(struct pp_hwmgr *hwmgr, ...@@ -962,7 +961,7 @@ static int polaris10_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
"can not find VDDC voltage value for " "can not find VDDC voltage value for "
"VDDC engine clock dependency table", "VDDC engine clock dependency table",
return result); return result);
level->ActivityLevel = sclk_al_threshold; level->ActivityLevel = data->current_profile_setting.sclk_activity;
level->CcPwrDynRm = 0; level->CcPwrDynRm = 0;
level->CcPwrDynRm1 = 0; level->CcPwrDynRm1 = 0;
...@@ -1033,7 +1032,6 @@ static int polaris10_populate_all_graphic_levels(struct pp_hwmgr *hwmgr) ...@@ -1033,7 +1032,6 @@ static int polaris10_populate_all_graphic_levels(struct pp_hwmgr *hwmgr)
result = polaris10_populate_single_graphic_level(hwmgr, result = polaris10_populate_single_graphic_level(hwmgr,
dpm_table->sclk_table.dpm_levels[i].value, dpm_table->sclk_table.dpm_levels[i].value,
hw_data->current_profile_setting.sclk_activity,
&(smu_data->smc_state_table.GraphicsLevel[i])); &(smu_data->smc_state_table.GraphicsLevel[i]));
if (result) if (result)
return result; return result;
......
...@@ -608,7 +608,6 @@ static int tonga_calculate_sclk_params(struct pp_hwmgr *hwmgr, ...@@ -608,7 +608,6 @@ static int tonga_calculate_sclk_params(struct pp_hwmgr *hwmgr,
static int tonga_populate_single_graphic_level(struct pp_hwmgr *hwmgr, static int tonga_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
uint32_t engine_clock, uint32_t engine_clock,
uint16_t sclk_activity_level_threshold,
SMU72_Discrete_GraphicsLevel *graphic_level) SMU72_Discrete_GraphicsLevel *graphic_level)
{ {
int result; int result;
...@@ -636,7 +635,7 @@ static int tonga_populate_single_graphic_level(struct pp_hwmgr *hwmgr, ...@@ -636,7 +635,7 @@ static int tonga_populate_single_graphic_level(struct pp_hwmgr *hwmgr,
/* SCLK frequency in units of 10KHz*/ /* SCLK frequency in units of 10KHz*/
graphic_level->SclkFrequency = engine_clock; graphic_level->SclkFrequency = engine_clock;
/* Indicates maximum activity level for this performance level. 50% for now*/ /* Indicates maximum activity level for this performance level. 50% for now*/
graphic_level->ActivityLevel = sclk_activity_level_threshold; graphic_level->ActivityLevel = data->current_profile_setting.sclk_activity;
graphic_level->CcPwrDynRm = 0; graphic_level->CcPwrDynRm = 0;
graphic_level->CcPwrDynRm1 = 0; graphic_level->CcPwrDynRm1 = 0;
...@@ -704,7 +703,6 @@ static int tonga_populate_all_graphic_levels(struct pp_hwmgr *hwmgr) ...@@ -704,7 +703,6 @@ static int tonga_populate_all_graphic_levels(struct pp_hwmgr *hwmgr)
for (i = 0; i < dpm_table->sclk_table.count; i++) { for (i = 0; i < dpm_table->sclk_table.count; i++) {
result = tonga_populate_single_graphic_level(hwmgr, result = tonga_populate_single_graphic_level(hwmgr,
dpm_table->sclk_table.dpm_levels[i].value, dpm_table->sclk_table.dpm_levels[i].value,
data->current_profile_setting.sclk_activity,
&(smu_data->smc_state_table.GraphicsLevel[i])); &(smu_data->smc_state_table.GraphicsLevel[i]));
if (result != 0) if (result != 0)
return result; return result;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment