Commit 83033f72 authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/gfx11: use generic [en/dis]able_kgq() helpers 



And remove the duplicate local variants.

Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f39c2535

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

+2 −47
Original line number Diff line number Diff line
@@ -3710,28 +3710,6 @@ static int gfx_v11_0_gfx_init_queue(struct amdgpu_ring *ring) 
	return 0;

}



static int gfx_v11_0_kiq_enable_kgq(struct amdgpu_device *adev)

{

	struct amdgpu_kiq *kiq = &adev->gfx.kiq[0];

	struct amdgpu_ring *kiq_ring = &adev->gfx.kiq[0].ring;

	int r, i;



	if (!kiq->pmf || !kiq->pmf->kiq_map_queues)

		return -EINVAL;



	r = amdgpu_ring_alloc(kiq_ring, kiq->pmf->map_queues_size *

					adev->gfx.num_gfx_rings);

	if (r) {

		DRM_ERROR("Failed to lock KIQ (%d).\n", r);

		return r;

	}



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

		kiq->pmf->kiq_map_queues(kiq_ring, &adev->gfx.gfx_ring[i]);



	return amdgpu_ring_test_helper(kiq_ring);

}



static int gfx_v11_0_cp_async_gfx_ring_resume(struct amdgpu_device *adev)

{

	int r, i;
@@ -3755,7 +3733,7 @@ static int gfx_v11_0_cp_async_gfx_ring_resume(struct amdgpu_device *adev) 
			goto done;

	}



	r = gfx_v11_0_kiq_enable_kgq(adev);

	r = amdgpu_gfx_enable_kgq(adev, 0);

	if (r)

		goto done;
@@ -4392,29 +4370,6 @@ static int gfx_v11_0_hw_init(void *handle) 
	return r;

}



static int gfx_v11_0_kiq_disable_kgq(struct amdgpu_device *adev)

{

	struct amdgpu_kiq *kiq = &adev->gfx.kiq[0];

	struct amdgpu_ring *kiq_ring = &kiq->ring;

	int i, r = 0;



	if (!kiq->pmf || !kiq->pmf->kiq_unmap_queues)

		return -EINVAL;



	if (amdgpu_ring_alloc(kiq_ring, kiq->pmf->unmap_queues_size *

					adev->gfx.num_gfx_rings))

		return -ENOMEM;



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

		kiq->pmf->kiq_unmap_queues(kiq_ring, &adev->gfx.gfx_ring[i],

					   PREEMPT_QUEUES, 0, 0);



	if (adev->gfx.kiq[0].ring.sched.ready)

		r = amdgpu_ring_test_helper(kiq_ring);



	return r;

}



static int gfx_v11_0_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;
@@ -4426,7 +4381,7 @@ static int gfx_v11_0_hw_fini(void *handle) 


	if (!adev->no_hw_access) {

		if (amdgpu_async_gfx_ring) {

			r = gfx_v11_0_kiq_disable_kgq(adev);

			r = amdgpu_gfx_disable_kgq(adev, 0);

			if (r)

				DRM_ERROR("KGQ disable failed\n");

		}