From: Rex Zhu Date: Tue, 18 Sep 2018 12:30:36 +0000 (+0800) Subject: drm/amd/pp: Return error immediately if load firmware failed X-Git-Tag: v5.4-rc1~2273^2~20^2~61 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19a86c08510f5edf64745e4c090e89ea105a14cf;p=platform%2Fkernel%2Flinux-rpi.git drm/amd/pp: Return error immediately if load firmware failed this can avoid hard hang and be useful for debug. Reviewed-by: Alex Deucher Signed-off-by: Rex Zhu Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c index f7e3bc2..a74c5be 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c @@ -724,11 +724,13 @@ static int smu8_start_smu(struct pp_hwmgr *hwmgr) if (hwmgr->chip_id == CHIP_STONEY) fw_to_check &= ~(UCODE_ID_SDMA1_MASK | UCODE_ID_CP_MEC_JT2_MASK); - ret = smu8_request_smu_load_fw(hwmgr); - if (ret) - pr_err("SMU firmware load failed\n"); + smu8_request_smu_load_fw(hwmgr); - 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); if (ret)