Patch "drm/amd/amdgpu: fix console deadlock if late init failed" has been added to the 4.9-stable tree

This is a note to let you know that I've just added the patch titled

drm/amd/amdgpu: fix console deadlock if late init failed

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
drm-amd-amdgpu-fix-console-deadlock-if-late-init-failed.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Jim Qu <[email protected]>
Date: Wed, 1 Mar 2017 15:53:29 +0800
Subject: drm/amd/amdgpu: fix console deadlock if late init failed

From: Jim Qu <[email protected]>

[ Upstream commit c085bd5119d5d0bdf3ef591a5563566be7dedced ]

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

@@ -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) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/drm-amd-amdgpu-fix-console-deadlock-if-late-init-failed.patch