From: Rex Zhu Date: Wed, 6 Jan 2016 09:17:53 +0000 (+0800) Subject: drm/amdgpu: fix hex/decimal bug when show gpu load. X-Git-Tag: v4.5-rc1~74^2~13^2~7 X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=ab4f4b14c36f7ae6fa204ca304477e42f6696453;p=cascardo%2Flinux.git drm/amdgpu: fix hex/decimal bug when show gpu load. Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c index c0e6aae8fa1d..65ad24a498a6 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c @@ -1494,7 +1494,7 @@ cz_print_current_perforce_level(struct pp_hwmgr *hwmgr, struct seq_file *m) uint32_t vce_index = PHM_GET_FIELD(cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, ixTARGET_AND_CURRENT_PROFILE_INDEX_2), TARGET_AND_CURRENT_PROFILE_INDEX_2, CURR_VCE_INDEX); - uint32_t sclk, vclk, dclk, ecclk, tmp, active_percent; + uint32_t sclk, vclk, dclk, ecclk, tmp, activity_percent; uint16_t vddnb, vddgfx; int result; @@ -1536,13 +1536,13 @@ cz_print_current_perforce_level(struct pp_hwmgr *hwmgr, struct seq_file *m) result = smum_send_msg_to_smc(hwmgr->smumgr, PPSMC_MSG_GetAverageGraphicsActivity); if (0 == result) { - active_percent = cgs_read_register(hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0); - active_percent = active_percent > 100 ? 100 : active_percent; + activity_percent = cgs_read_register(hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0); + activity_percent = activity_percent > 100 ? 100 : activity_percent; } else { - active_percent = 50; + activity_percent = 50; } - seq_printf(m, "\n [GPU load]: %u %%\n\n", active_percent); + seq_printf(m, "\n [GPU load]: %u %%\n\n", activity_percent); } static void cz_hw_print_display_cfg( diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c index 0b188d13364f..44a925006479 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c @@ -5157,7 +5157,7 @@ static int tonga_get_pp_table_entry(struct pp_hwmgr *hwmgr, static void tonga_print_current_perforce_level(struct pp_hwmgr *hwmgr, struct seq_file *m) { - uint32_t sclk, mclk, active_percent; + uint32_t sclk, mclk, activity_percent; uint32_t offset; struct tonga_hwmgr *data = (struct tonga_hwmgr *)(hwmgr->backend); @@ -5172,11 +5172,11 @@ tonga_print_current_perforce_level(struct pp_hwmgr *hwmgr, struct seq_file *m) offset = data->soft_regs_start + offsetof(SMU72_SoftRegisters, AverageGraphicsActivity); - active_percent = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, offset); - active_percent += 80; - active_percent >>= 8; + activity_percent = cgs_read_ind_register(hwmgr->device, CGS_IND_REG__SMC, offset); + activity_percent += 0x80; + activity_percent >>= 8; - seq_printf(m, "\n [GPU load]: %u%%\n\n", active_percent > 100 ? 100 : active_percent); + seq_printf(m, "\n [GPU load]: %u%%\n\n", activity_percent > 100 ? 100 : activity_percent); }