Commit 31e3aad6 authored Oct 25, 2018 by Andrey Grodzovsky Committed by Alex Deucher Oct 26, 2018

drm/amdgpu: Fix compute ring 1.0.0 failure after reset



Problem: After GPU reset on dGPUs with gfx8 compute ring
1.0.0 fails to pass the ring test. Ring registers inspection
shows that it's active and no hang is observed (rptr == wptr)
No significant diffs were observed between CP_HQD* registers
for the ring in good and bad shape.

Fix: No clear reason why but reversing the order of ring tests
fixes the problem.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 4faaaa76

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -4815,8 +4815,10 @@ static int gfx_v8_0_kcq_resume(struct amdgpu_device *adev)
		if (r)
		goto done;

		/* Test KCQs */
		for (i = 0; i < adev->gfx.num_compute_rings; i++) {
		/* Test KCQs - reversing the order of rings seems to fix ring test failure
		* after GPU reset
		*/
		for (i = adev->gfx.num_compute_rings - 1; i >= 0; i--) {
		ring = &adev->gfx.compute_ring[i];
		ring->ready = true;
		r = amdgpu_ring_test_ring(ring);