Patch "drm/amdgpu: read reg in each iterator of psp_wait_for loop" has been added to the 4.13-stable tree

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

drm/amdgpu: read reg in each iterator of psp_wait_for loop

to the 4.13-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-read-reg-in-each-iterator-of-psp_wait_for-loop.patch
and it can be found in the queue-4.13 subdirectory.

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

From: "Zhang, Jerry" <[email protected]>
Date: Fri, 14 Jul 2017 18:20:17 +0800
Subject: drm/amdgpu: read reg in each iterator of psp_wait_for loop

From: Zhang, Jerry <[email protected]>

commit 2890decfd9969cac21067ca0c734fbccaf74d634 upstream.

v2: fix the SOS loading failure for PSP v3.1

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c |    3 +--
 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   |    2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

@@ -95,9 +95,8 @@ int psp_wait_for(struct psp_context *psp
 	int i;
 	struct amdgpu_device *adev = psp->adev;
 
-	val = RREG32(reg_index);
-
 	for (i = 0; i < adev->usec_timeout; i++) {
+		val = RREG32(reg_index);
 		if (check_changed) {
 			if (val != reg_val)
 				return 0;

@@ -237,11 +237,9 @@ int psp_v3_1_bootloader_load_sos(struct
 
 	/* there might be handshake issue with hardware which needs delay */
 	mdelay(20);
-#if 0
 	ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_81),
 			   RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81),
 			   0, true);
-#endif
 
 	return ret;
 }

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

queue-4.13/drm-amdgpu-read-reg-in-each-iterator-of-psp_wait_for-loop.patch