Commit d63cda5b authored Dec 04, 2018 by Xiangliang Yu Committed by Alex Deucher Dec 07, 2018

drm/amdgpu/psp: Get psp fw version through reading register



If PSP FW is running already, driver will not load PSP FW again and skip
it. So psp fw version is not correct if reading it from FW binary file,
need to get right version from register.

Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 07daa8a0

drivers/gpu/drm/amd/amdgpu/psp_v11_0.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -171,8 +171,10 @@ static int psp_v11_0_bootloader_load_sysdrv(struct psp_context *psp)
		* are already been loaded.
		*/
		sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
		if (sol_reg)
		if (sol_reg) {
		psp->sos_fw_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);
		return 0;
		}

		/* Wait for bootloader to signify that is ready having bit 31 of C2PMSG_35 set to 1 */
		ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_35),

Admin message