OSDN Git Service

drm/amdgpu: refine code delete duplicated error handling
authorRex Zhu <Rex.Zhu@amd.com>
Mon, 9 Oct 2017 05:50:31 +0000 (13:50 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 19 Oct 2017 19:26:53 +0000 (15:26 -0400)
in function amdgpu_ucode_init_bo, when failed, it will
set load_type to AMDGPU_FW_LOAD_DIRECT.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

index 412ad99..1f793eb 100644 (file)
@@ -1711,8 +1711,8 @@ static int amdgpu_init(struct amdgpu_device *adev)
        }
 
        mutex_lock(&adev->firmware.mutex);
-       if (amdgpu_ucode_init_bo(adev))
-               adev->firmware.load_type = AMDGPU_FW_LOAD_DIRECT;
+       if (adev->firmware.load_type != AMDGPU_FW_LOAD_DIRECT)
+               amdgpu_ucode_init_bo(adev);
        mutex_unlock(&adev->firmware.mutex);
 
        for (i = 0; i < adev->num_ip_blocks; i++) {