Commit 19a86c08 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher

drm/amd/pp: Return error immediately if load firmware failed

this can avoid hard hang and be useful for debug.
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0fb5da0a
...@@ -724,11 +724,13 @@ static int smu8_start_smu(struct pp_hwmgr *hwmgr) ...@@ -724,11 +724,13 @@ static int smu8_start_smu(struct pp_hwmgr *hwmgr)
if (hwmgr->chip_id == CHIP_STONEY) if (hwmgr->chip_id == CHIP_STONEY)
fw_to_check &= ~(UCODE_ID_SDMA1_MASK | UCODE_ID_CP_MEC_JT2_MASK); fw_to_check &= ~(UCODE_ID_SDMA1_MASK | UCODE_ID_CP_MEC_JT2_MASK);
ret = smu8_request_smu_load_fw(hwmgr); smu8_request_smu_load_fw(hwmgr);
if (ret)
pr_err("SMU firmware load failed\n");
smu8_check_fw_load_finish(hwmgr, fw_to_check); ret = smu8_check_fw_load_finish(hwmgr, fw_to_check);
if (ret) {
pr_err("SMU firmware load failed\n");
return ret;
}
ret = smu8_load_mec_firmware(hwmgr); ret = smu8_load_mec_firmware(hwmgr);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment