Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17982c6a authored by Evan Quan's avatar Evan Quan Committed by Greg Kroah-Hartman
Browse files

drm/amd/powerplay: correct power reading on fiji 



commit f5742ec36422a39b57f0256e4847f61b3c432f8c upstream.

Set sampling period as 500ms to provide a smooth power
reading output. Also, correct the register for power
reading.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 808b1c1e

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

+3 −3
Original line number Diff line number Diff line
@@ -3487,14 +3487,14 @@ static int smu7_get_gpu_power(struct pp_hwmgr *hwmgr, u32 *query) 


	smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogStart);

	cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,

							ixSMU_PM_STATUS_94, 0);

							ixSMU_PM_STATUS_95, 0);



	for (i = 0; i < 10; i++) {

		mdelay(1);

		mdelay(500);

		smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogSample);

		tmp = cgs_read_ind_register(hwmgr->device,

						CGS_IND_REG__SMC,

						ixSMU_PM_STATUS_94);

						ixSMU_PM_STATUS_95);

		if (tmp != 0)

			break;

	}