The variable highest_pcie_level_enabled is named
hightest_pcie_level_enabled in other modules.
Please ensure the consistency of variable naming
and use min macros instead of the triadic operator.
Signed-off-by: Yang Ruibin <11162...@vivo.com>
---
.../drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
b/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
index 6fe6e6abb..60b1387f6 100644
--- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
+++ b/drivers/gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c
@@ -700,7 +700,7 @@ static int tonga_populate_all_graphic_levels(struct
pp_hwmgr *hwmgr)
SMU72_Discrete_GraphicsLevel *levels =
smu_data->smc_state_table.GraphicsLevel;
uint32_t i, max_entry;
- uint8_t highest_pcie_level_enabled = 0;
+ uint8_t hightest_pcie_level_enabled = 0;
uint8_t lowest_pcie_level_enabled = 0, mid_pcie_level_enabled = 0;
uint8_t count = 0;
int result = 0;
@@ -747,8 +747,8 @@ static int tonga_populate_all_graphic_levels(struct
pp_hwmgr *hwmgr)
while (data->dpm_level_enable_mask.pcie_dpm_enable_mask &&
((data->dpm_level_enable_mask.pcie_dpm_enable_mask &
- (1<<(highest_pcie_level_enabled+1))) !=
0)) {
- highest_pcie_level_enabled++;
+ (1<<(hightest_pcie_level_enabled+1)))
!= 0)) {
+ hightest_pcie_level_enabled++;
}
while (data->dpm_level_enable_mask.pcie_dpm_enable_mask &&
@@ -757,18 +757,19 @@ static int tonga_populate_all_graphic_levels(struct
pp_hwmgr *hwmgr)
lowest_pcie_level_enabled++;
}
- while ((count < highest_pcie_level_enabled) &&
+ while ((count < hightest_pcie_level_enabled) &&
((data->dpm_level_enable_mask.pcie_dpm_enable_mask &
(1<<(lowest_pcie_level_enabled+1+count))) == 0)) {
count++;
}
- mid_pcie_level_enabled = (lowest_pcie_level_enabled+1+count) <
highest_pcie_level_enabled ?
- (lowest_pcie_level_enabled+1+count) :
highest_pcie_level_enabled;
+ mid_pcie_level_enabled = min(lowest_pcie_level_enabled+1+count,
+ hightest_pcie_level_enabled);
- /* set pcieDpmLevel to highest_pcie_level_enabled*/
+ /* set pcieDpmLevel to hightest_pcie_level_enabled*/
for (i = 2; i < dpm_table->sclk_table.count; i++)
- smu_data->smc_state_table.GraphicsLevel[i].pcieDpmLevel
= highest_pcie_level_enabled;
+ smu_data->smc_state_table.GraphicsLevel[i].pcieDpmLevel
=
+ hightest_pcie_level_enabled;
/* set pcieDpmLevel to lowest_pcie_level_enabled*/
smu_data->smc_state_table.GraphicsLevel[0].pcieDpmLevel =
lowest_pcie_level_enabled;
--
2.34.1
