Commit d4d27897 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: remove unnecessary tOS version check 



tOS version is available through debugfs interface

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a2676149

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

+2 −8
Original line number Diff line number Diff line
@@ -283,11 +283,8 @@ static int psp_v11_0_bootloader_load_kdb(struct psp_context *psp) 
	/* Check tOS sign of life register to confirm sys driver and sOS

	 * are already been loaded.

	 */

	if (psp_v11_0_is_sos_alive(psp)) {

		psp->sos_fw_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);

		dev_info(adev->dev, "sos fw version = 0x%x.\n", psp->sos_fw_version);

	if (psp_v11_0_is_sos_alive(psp))

		return 0;

	}



	ret = psp_v11_0_wait_for_bootloader(psp);

	if (ret)
@@ -319,11 +316,8 @@ static int psp_v11_0_bootloader_load_sysdrv(struct psp_context *psp) 
	/* Check sOS sign of life register to confirm sys driver and sOS

	 * are already been loaded.

	 */

	if (psp_v11_0_is_sos_alive(psp)) {

		psp->sos_fw_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);

		dev_info(adev->dev, "sos fw version = 0x%x.\n", psp->sos_fw_version);

	if (psp_v11_0_is_sos_alive(psp))

		return 0;

	}



	ret = psp_v11_0_wait_for_bootloader(psp);

	if (ret)

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

+1 −4
Original line number Diff line number Diff line
@@ -95,11 +95,8 @@ static int psp_v12_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) {

		psp->sos_fw_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);

		printk("sos fw version = 0x%x.\n", psp->sos_fw_version);

	if (sol_reg)

		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),

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

+1 −4
Original line number Diff line number Diff line
@@ -197,11 +197,8 @@ static int psp_v3_1_bootloader_load_sos(struct psp_context *psp) 
	 * are already been loaded.

	 */

	sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);

	if (sol_reg) {

		psp->sos_fw_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);

		printk("sos fw version = 0x%x.\n", psp->sos_fw_version);

	if (sol_reg)

		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),

CRA Git | Maintained and supported by SUSTech CRA and CCSE