Commit 315fed03 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: cleanup skipping IB test on KIQ 



Instead of hard coding the ring type in the function just never provide
a test_ib callback.

Additional to that remove the emit_ib callback to make sure the nobody
ever tries to execute an IB on the KIQ.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent af70a471

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

+3 −8
Original line number Diff line number Diff line
@@ -351,15 +351,10 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 
		struct amdgpu_ring *ring = adev->rings[i];

		long tmo;



		if (!ring->sched.ready)

			continue;



		/* skip IB tests for KIQ in general for the below reasons:

		 * 1. We never submit IBs to the KIQ

		 * 2. KIQ doesn't use the EOP interrupts,

		 *    we use some other CP interrupt.

		/* KIQ rings don't have an IB test because we never submit IBs

		 * to them and they have no interrupt support.

		 */

		if (ring->funcs->type == AMDGPU_RING_TYPE_KIQ)

		if (!ring->sched.ready || !ring->funcs->test_ib)

			continue;



		/* MM engine need more time */

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

+0 −2
Original line number Diff line number Diff line
@@ -6989,10 +6989,8 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_kiq = { 
		17 + /* gfx_v8_0_ring_emit_vm_flush */

		7 + 7 + 7, /* gfx_v8_0_ring_emit_fence_kiq x3 for user fence, vm fence */

	.emit_ib_size =	4, /* gfx_v8_0_ring_emit_ib_compute */

	.emit_ib = gfx_v8_0_ring_emit_ib_compute,

	.emit_fence = gfx_v8_0_ring_emit_fence_kiq,

	.test_ring = gfx_v8_0_ring_test_ring,

	.test_ib = gfx_v8_0_ring_test_ib,

	.insert_nop = amdgpu_ring_insert_nop,

	.pad_ib = amdgpu_ring_generic_pad_ib,

	.emit_rreg = gfx_v8_0_ring_emit_rreg,

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

+0 −2
Original line number Diff line number Diff line
@@ -4848,10 +4848,8 @@ static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = { 
		2 + /* gfx_v9_0_ring_emit_vm_flush */

		8 + 8 + 8, /* gfx_v9_0_ring_emit_fence_kiq x3 for user fence, vm fence */

	.emit_ib_size =	4, /* gfx_v9_0_ring_emit_ib_compute */

	.emit_ib = gfx_v9_0_ring_emit_ib_compute,

	.emit_fence = gfx_v9_0_ring_emit_fence_kiq,

	.test_ring = gfx_v9_0_ring_test_ring,

	.test_ib = gfx_v9_0_ring_test_ib,

	.insert_nop = amdgpu_ring_insert_nop,

	.pad_ib = amdgpu_ring_generic_pad_ib,

	.emit_rreg = gfx_v9_0_ring_emit_rreg,

CRA Git | Maintained and supported by SUSTech CRA and CCSE