[PATCH] drm/amdgpu: refine code delete duplicated error handling

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf
> Of Rex Zhu
> Sent: Monday, October 09, 2017 2:02 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Zhu, Rex
> Subject: [PATCH] drm/amdgpu: refine code delete duplicated error handling
> 
> in function amdgpu_ucode_init_bo, when failed, it will
> set load_type to AMDGPU_FW_LOAD_DIRECT.
> 
> Change-Id: Id671b168425dc46331aaf4bd2b734e88b9bfaf3c
> Signed-off-by: Rex Zhu <Rex.Zhu at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 9311096..9c87853 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -1679,8 +1679,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++) {
> --
> 1.9.1
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx