From bb719da7c9dd93984f6829721690beb1f46d664b Mon Sep 17 00:00:00 2001 From: Rex Zhu Date: Sat, 29 Sep 2018 13:28:20 +0800 Subject: [PATCH 0468/2940] drm/amd/pp: Refine function iceland_start_smu if upload firmware failed, no matter how many times the function runs again, the same error will be encountered. so remove the duplicated code. Reviewed-by: Evan Quan Signed-off-by: Rex Zhu --- .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c index 2d4c7f167b88..2287ad6928d4 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c @@ -234,22 +234,12 @@ static int iceland_start_smu(struct pp_hwmgr *hwmgr) { int result; - result = iceland_smu_upload_firmware_image(hwmgr); - if (result) - return result; - result = iceland_smu_start_smc(hwmgr); - if (result) - return result; - if (!smu7_is_smc_ram_running(hwmgr)) { - pr_info("smu not running, upload firmware again \n"); result = iceland_smu_upload_firmware_image(hwmgr); if (result) return result; - result = iceland_smu_start_smc(hwmgr); - if (result) - return result; + iceland_smu_start_smc(hwmgr); } result = smu7_request_smu_load_fw(hwmgr); -- 2.17.1