Patch "drm/amdgpu: fix s4 resume" has been added to the 4.4-stable tree

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

drm/amdgpu: fix s4 resume

to the 4.4-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-amdgpu-fix-s4-resume.patch
and it can be found in the queue-4.4 subdirectory.

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

From: Flora Cui <[email protected]>
Date: Thu, 4 Feb 2016 15:10:08 +0800
Subject: drm/amdgpu: fix s4 resume

From: Flora Cui <[email protected]>

commit ca19852884c8937eed89560f924f5a34cfcc22af upstream.

No need to re-init asic if it's already been initialized. Skip IB tests since kernel processes are frozen in thaw.

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

@@ -1744,15 +1744,20 @@ int amdgpu_resume_kms(struct drm_device
 	}
 
 	/* post card */
-	amdgpu_atom_asic_init(adev->mode_info.atom_context);
+	if (!amdgpu_card_posted(adev))
+		amdgpu_atom_asic_init(adev->mode_info.atom_context);
 
 	r = amdgpu_resume(adev);
+	if (r)
+		DRM_ERROR("amdgpu_resume failed (%d).\n", r);
 
 	amdgpu_fence_driver_resume(adev);
 
-	r = amdgpu_ib_ring_tests(adev);
-	if (r)
-		DRM_ERROR("ib ring test failed (%d).\n", r);
+	if (resume) {
+		r = amdgpu_ib_ring_tests(adev);
+		if (r)
+			DRM_ERROR("ib ring test failed (%d).\n", r);
+	}
 
 	r = amdgpu_late_init(adev);
 	if (r)

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

queue-4.4/drm-amdgpu-fix-s4-resume.patch