Patch "drm/amdgpu: apply gfx_v8 fixes to gfx_v7 as well" 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: apply gfx_v8 fixes to gfx_v7 as well

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-apply-gfx_v8-fixes-to-gfx_v7-as-well.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: =?UTF-8?q?Christian=20K=C3=B6nig?= <[email protected]>
Date: Fri, 26 Feb 2016 16:18:15 +0100
Subject: drm/amdgpu: apply gfx_v8 fixes to gfx_v7 as well
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Christian König <[email protected]>

commit feebe91aa9a9d99d9ec157612a614fadb79beb99 upstream.

We never ported that back to CIK, so we could run into VM faults here.

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

@@ -3628,6 +3628,19 @@ static void gfx_v7_0_ring_emit_vm_flush(
 					unsigned vm_id, uint64_t pd_addr)
 {
 	int usepfp = (ring->type == AMDGPU_RING_TYPE_GFX);
+	uint32_t seq = ring->fence_drv.sync_seq;
+	uint64_t addr = ring->fence_drv.gpu_addr;
+
+	amdgpu_ring_write(ring, PACKET3(PACKET3_WAIT_REG_MEM, 5));
+	amdgpu_ring_write(ring, (WAIT_REG_MEM_MEM_SPACE(1) | /* memory */
+				 WAIT_REG_MEM_FUNCTION(3) | /* equal */
+				 WAIT_REG_MEM_ENGINE(usepfp)));   /* pfp or me */
+	amdgpu_ring_write(ring, addr & 0xfffffffc);
+	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
+	amdgpu_ring_write(ring, seq);
+	amdgpu_ring_write(ring, 0xffffffff);
+	amdgpu_ring_write(ring, 4); /* poll interval */
+
 	if (usepfp) {
 		/* synce CE with ME to prevent CE fetch CEIB before context switch done */
 		amdgpu_ring_write(ring, PACKET3(PACKET3_SWITCH_BUFFER, 0));

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

queue-4.4/drm-amdgpu-mask-out-wc-from-bo-on-unsupported-arches.patch queue-4.4/drm-amdgpu-pm-update-current-crtc-info-after-setting-the-powerstate.patch queue-4.4/drm-radeon-pm-update-current-crtc-info-after-setting-the-powerstate.patch queue-4.4/drm-amdgpu-apply-gfx_v8-fixes-to-gfx_v7-as-well.patch queue-4.4/drm-amdgpu-gfx8-specify-which-engine-to-wait-before-vm-flush.patch