Commit 93ab59ac authored by Guchun Chen's avatar Guchun Chen Committed by Alex Deucher
Browse files

drm/amdgpu: switch to unified amdgpu_ring_test_helper 



This will simplify code.

Signed-off-by: default avatarGuchun Chen <guchun.chen@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 232f2431

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

+2 −7
Original line number Diff line number Diff line
@@ -1305,14 +1305,9 @@ static int amdgpu_mes_test_queues(struct amdgpu_ring **added_rings) 
		if (!ring)

			continue;



		r = amdgpu_ring_test_ring(ring);

		if (r) {

			DRM_DEV_ERROR(ring->adev->dev,

				      "ring %s test failed (%d)\n",

				      ring->name, r);

		r = amdgpu_ring_test_helper(ring);

		if (r)

			return r;

		} else

			DRM_INFO("ring %s test pass\n", ring->name);



		r = amdgpu_ring_test_ib(ring, 1000 * 10);

		if (r) {

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

+1 −7
Original line number Diff line number Diff line
@@ -815,13 +815,7 @@ static int mes_v10_1_kiq_enable_queue(struct amdgpu_device *adev) 


	kiq->pmf->kiq_map_queues(kiq_ring, &adev->mes.ring);



	r = amdgpu_ring_test_ring(kiq_ring);

	if (r) {

		DRM_ERROR("kfq enable failed\n");

		kiq_ring->sched.ready = false;

	}



	return r;

	return amdgpu_ring_test_helper(kiq_ring);

}



static int mes_v10_1_queue_init(struct amdgpu_device *adev)

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

+1 −6
Original line number Diff line number Diff line
@@ -882,12 +882,7 @@ static int mes_v11_0_kiq_enable_queue(struct amdgpu_device *adev) 


	kiq->pmf->kiq_map_queues(kiq_ring, &adev->mes.ring);



	r = amdgpu_ring_test_ring(kiq_ring);

	if (r) {

		DRM_ERROR("kfq enable failed\n");

		kiq_ring->sched.ready = false;

	}

	return r;

	return amdgpu_ring_test_helper(kiq_ring);

}



static int mes_v11_0_queue_init(struct amdgpu_device *adev,

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

+2 −6
Original line number Diff line number Diff line
@@ -622,13 +622,9 @@ static int sdma_v5_2_gfx_resume(struct amdgpu_device *adev) 
			sdma_v5_2_enable(adev, true);

		}



		r = amdgpu_ring_test_ring(ring);

		if (r) {

			ring->sched.ready = false;

		r = amdgpu_ring_test_helper(ring);

		if (r)

			return r;

		}



		ring->sched.ready = true;



		if (adev->mman.buffer_funcs_ring == ring)

			amdgpu_ttm_set_buffer_funcs_status(adev, true);