drm/amdgpu/sdma5: fix mask value of POLL_REGMEM packet for pipe sync

Xiaojie Yuan · alexdeucher · commit d12c50857c6e · 2019-10-11T21:32:06.000-05:00
sdma will hang once sequence number to be polled reaches 0x1000_0000

Reviewed-by: Christian König &lt;christian.koenig@amd.com&gt;
Signed-off-by: Xiaojie Yuan &lt;xiaojie.yuan@amd.com&gt;
Reviewed-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
Cc: stable@vger.kernel.org
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1129,7 +1129,7 @@ static void sdma_v5_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)
 	amdgpu_ring_write(ring, addr & 0xfffffffc);
 	amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);
 	amdgpu_ring_write(ring, seq); /* reference */
-	amdgpu_ring_write(ring, 0xfffffff); /* mask */
+	amdgpu_ring_write(ring, 0xffffffff); /* mask */
 	amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) |
 			  SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */
 }

Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,7 @@ static void sdma_v5_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)`
`1129`	`1129`	`amdgpu_ring_write(ring, addr & 0xfffffffc);`
`1130`	`1130`	`amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);`
`1131`	`1131`	`amdgpu_ring_write(ring, seq); /* reference */`
`1132`		`- amdgpu_ring_write(ring, 0xfffffff); /* mask */`
	`1132`	`+ amdgpu_ring_write(ring, 0xffffffff); /* mask */`
`1133`	`1133`	`amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) \|`
`1134`	`1134`	`SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */`
`1135`	`1135`	`}`