| From foo@baz Tue Dec 12 13:26:17 CET 2017 |
| From: Jim Qu <Jim.Qu@amd.com> |
| Date: Wed, 1 Mar 2017 15:53:29 +0800 |
| Subject: drm/amd/amdgpu: fix console deadlock if late init failed |
| |
| From: Jim Qu <Jim.Qu@amd.com> |
| |
| |
| [ Upstream commit c085bd5119d5d0bdf3ef591a5563566be7dedced ] |
| |
| Signed-off-by: Jim Qu <Jim.Qu@amd.com> |
| Reviewed-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Alex Deucher <alexander.deucher@amd.com> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |
| @@ -2020,8 +2020,11 @@ int amdgpu_device_resume(struct drm_devi |
| } |
| |
| 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) { |
