[PATCH 1/2] drm/amd/amdgpu: fix console deadlock if late init failed

[michel@xxxxxxxxxxx (Michel Dänzer)]

On 01/03/17 06:35 PM, Jim Qu wrote:
> Change-Id: Ia914fac083ebab39617dad046d4bb98ab1ddf0a8
> Signed-off-by: Jim Qu <Jim.Qu at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index c0679d3..6eeda24 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -2186,8 +2186,11 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
>  	}
>  
>  	r = amdgpu_late_init(adev);
> -	if (r)
> +	if (r) {
> +		if (fbcon)
> +			console_unlock();
>  		return r;
> +	}
>  
>  	/* pin cursors */
>  	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
> 

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer