leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: remove unnecessary tOS version check

Browse Source 
tOS version is available through debugfs interface

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Hawking Zhang
2020-04-20 15:57:26 +08:00
committed by Alex Deucher
parent a267614932
commit d4d27897db
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/amd/amdgpu/psp_v11_0.c
View File

@@ -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 /* Check tOS sign of life register to confirm sys driver and sOS
* are already been loaded. * are already been loaded.
*/ */
if (psp_v11_0_is_sos_alive(psp)) { 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);
return 0; return 0;
}
ret = psp_v11_0_wait_for_bootloader(psp); ret = psp_v11_0_wait_for_bootloader(psp);
if (ret) 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 /* Check sOS sign of life register to confirm sys driver and sOS
* are already been loaded. * are already been loaded.
*/ */
if (psp_v11_0_is_sos_alive(psp)) { 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);
return 0; return 0;
}
ret = psp_v11_0_wait_for_bootloader(psp); ret = psp_v11_0_wait_for_bootloader(psp);
if (ret) if (ret)

5
drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
View File

@@ -95,11 +95,8 @@ static int psp_v12_0_bootloader_load_sysdrv(struct psp_context *psp)
* are already been loaded. * are already been loaded.
*/ */
sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81); 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);
printk("sos fw version = 0x%x.\n", psp->sos_fw_version);
return 0; return 0;
}
/* Wait for bootloader to signify that is ready having bit 31 of C2PMSG_35 set to 1 */ /* 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), ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_35),

5
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
View File

@@ -197,11 +197,8 @@ static int psp_v3_1_bootloader_load_sos(struct psp_context *psp)
* are already been loaded. * are already been loaded.
*/ */
sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81); 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);
printk("sos fw version = 0x%x.\n", psp->sos_fw_version);
return 0; return 0;
}
/* Wait for bootloader to signify that is ready having bit 31 of C2PMSG_35 set to 1 */ /* 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), ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_35),