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

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

drm/amdgpu: send SDMA/GFX IB tests directly to the ring again 



There is no point in sending them through the scheduler.

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

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

+1 −3
Original line number Diff line number Diff line
@@ -633,9 +633,7 @@ static int cik_sdma_ring_test_ib(struct amdgpu_ring *ring) 
	ib.ptr[3] = 1;

	ib.ptr[4] = 0xDEADBEEF;

	ib.length_dw = 5;

	r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,

						 AMDGPU_FENCE_OWNER_UNDEFINED,

						 &f);

	r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err1;

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

+1 −3
Original line number Diff line number Diff line
@@ -2641,9 +2641,7 @@ static int gfx_v7_0_ring_test_ib(struct amdgpu_ring *ring) 
	ib.ptr[2] = 0xDEADBEEF;

	ib.length_dw = 3;



	r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,

						 AMDGPU_FENCE_OWNER_UNDEFINED,

						 &f);

	r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err2;

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

+2 −6
Original line number Diff line number Diff line
@@ -709,9 +709,7 @@ static int gfx_v8_0_ring_test_ib(struct amdgpu_ring *ring) 
	ib.ptr[2] = 0xDEADBEEF;

	ib.length_dw = 3;



	r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,

						 AMDGPU_FENCE_OWNER_UNDEFINED,

						 &f);

	r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err2;
@@ -1266,9 +1264,7 @@ static int gfx_v8_0_do_edc_gpr_workarounds(struct amdgpu_device *adev) 
	ib.ptr[ib.length_dw++] = EVENT_TYPE(7) | EVENT_INDEX(4);



	/* shedule the ib on the ring */

	r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,

						 AMDGPU_FENCE_OWNER_UNDEFINED,

						 &f);

	r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r) {

		DRM_ERROR("amdgpu: ib submit failed (%d).\n", r);

		goto fail;

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

+1 −3
Original line number Diff line number Diff line
@@ -691,9 +691,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring) 
	ib.ptr[7] = SDMA_PKT_HEADER_OP(SDMA_OP_NOP);

	ib.length_dw = 8;



	r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,

						 AMDGPU_FENCE_OWNER_UNDEFINED,

						 &f);

	r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err1;

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

+1 −3
Original line number Diff line number Diff line
@@ -842,9 +842,7 @@ static int sdma_v3_0_ring_test_ib(struct amdgpu_ring *ring) 
	ib.ptr[7] = SDMA_PKT_NOP_HEADER_OP(SDMA_OP_NOP);

	ib.length_dw = 8;



	r = amdgpu_sched_ib_submit_kernel_helper(adev, ring, &ib, 1, NULL,

						 AMDGPU_FENCE_OWNER_UNDEFINED,

						 &f);

	r = amdgpu_ib_schedule(ring, 1, &ib, AMDGPU_FENCE_OWNER_UNDEFINED, &f);

	if (r)

		goto err1;