Patch "drm/amd/amdgpu: sdma resume fail during S4 on CI" has been added to the 4.7-stable tree

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

drm/amd/amdgpu: sdma resume fail during S4 on CI

to the 4.7-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-sdma-resume-fail-during-s4-on-ci.patch
and it can be found in the queue-4.7 subdirectory.

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

From: jimqu <[email protected]>
Date: Tue, 30 Aug 2016 08:59:42 +0800
Subject: drm/amd/amdgpu: sdma resume fail during S4 on CI

From: jimqu <[email protected]>

commit 10ea9434065e56fe14287f89258ecf2fb684ed1a upstream.

SDMA could be fail in the thaw() and restore() processes, do software reset if each SDMA engine is busy.

---
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c |    3 +++
 1 file changed, 3 insertions(+)

@@ -52,6 +52,7 @@ static void cik_sdma_set_ring_funcs(stru
 static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev);
 static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev);
 static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev);
+static int cik_sdma_soft_reset(void *handle);
 
 MODULE_FIRMWARE("radeon/bonaire_sdma.bin");
 MODULE_FIRMWARE("radeon/bonaire_sdma1.bin");

@@ -1051,6 +1052,8 @@ static int cik_sdma_resume(void *handle)
 {
 	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
 
+	cik_sdma_soft_reset(handle);
+
 	return cik_sdma_hw_init(adev);
 }
 

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

queue-4.7/drm-amd-amdgpu-sdma-resume-fail-during-s4-on-ci.patch queue-4.7/drm-amd-amdgpu-compute-ring-test-fail-during-s4-on-ci.patch