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

Xiaojie Yuan · gregkh · commit ace574d8c1d7 · 2019-10-29T09:22:24.000+01:00
commit d12c508 upstream. sdma will hang once sequence number to be polled reaches 0x1000_0000 Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c
@@ -1086,7 +1086,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
`@@ -1086,7 +1086,7 @@ static void sdma_v5_0_ring_emit_pipeline_sync(struct amdgpu_ring *ring)`
`1086`	`1086`	`amdgpu_ring_write(ring, addr & 0xfffffffc);`
`1087`	`1087`	`amdgpu_ring_write(ring, upper_32_bits(addr) & 0xffffffff);`
`1088`	`1088`	`amdgpu_ring_write(ring, seq); /* reference */`
`1089`		`- amdgpu_ring_write(ring, 0xfffffff); /* mask */`
	`1089`	`+ amdgpu_ring_write(ring, 0xffffffff); /* mask */`
`1090`	`1090`	`amdgpu_ring_write(ring, SDMA_PKT_POLL_REGMEM_DW5_RETRY_COUNT(0xfff) \|`
`1091`	`1091`	`SDMA_PKT_POLL_REGMEM_DW5_INTERVAL(4)); /* retry count, poll interval */`
`1092`	`1092`	`}`