Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e263c82 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx8: test KIQ before compute rings 



If KIQ isn't working, the compute rings won't work either.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6a6f380f

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

+7 −6
Original line number Diff line number Diff line
@@ -4980,6 +4980,13 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev) 
	if (r)

		goto done;



	ring->ready = true;

	r = amdgpu_ring_test_ring(ring);

	if (r) {

		ring->ready = false;

		goto done;

	}



	for (i = 0; i < adev->gfx.num_compute_rings; i++) {

		ring = &adev->gfx.compute_ring[i];
@@ -5008,12 +5015,6 @@ static int gfx_v8_0_kiq_resume(struct amdgpu_device *adev) 
			ring->ready = false;

	}



	ring = &adev->gfx.kiq.ring;

	ring->ready = true;

	r = amdgpu_ring_test_ring(ring);

	if (r)

		ring->ready = false;



done:

	return r;

}