Commit c66ed765 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amdgpu: Retire amdgpu_ring.ready flag v4 



Start using drm_gpu_scheduler.ready isntead.

v3:
Add helper function to run ring test and set
sched.ready flag status accordingly, clean explicit
sched.ready sets from the IP specific files.

v4: Add kerneldoc and rebase.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void amdgpu_amdkfd_device_init(struct amdgpu_device *adev) 
				  KGD_MAX_QUEUES);



		/* remove the KIQ bit as well */

		if (adev->gfx.kiq.ring.ready)

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

			clear_bit(amdgpu_gfx_queue_to_bit(adev,

							  adev->gfx.kiq.ring.me - 1,

							  adev->gfx.kiq.ring.pipe,

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

+1 −1
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ static int invalidate_tlbs(struct kgd_dev *kgd, uint16_t pasid) 
	if (adev->in_gpu_reset)

		return -EIO;



	if (ring->ready)

	if (ring->sched.ready)

		return invalidate_tlbs_with_kiq(adev, pasid);



	for (vmid = 0; vmid < 16; vmid++) {

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

+3 −3
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, 
		fence_ctx = 0;

	}



	if (!ring->ready) {

	if (!ring->sched.ready) {

		dev_err(adev->dev, "couldn't schedule ib on ring <%s>\n", ring->name);

		return -EINVAL;

	}
@@ -351,7 +351,7 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 
		struct amdgpu_ring *ring = adev->rings[i];

		long tmo;



		if (!ring || !ring->ready)

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

			continue;



		/* skip IB tests for KIQ in general for the below reasons:
@@ -375,7 +375,7 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) 


		r = amdgpu_ring_test_ib(ring, tmo);

		if (r) {

			ring->ready = false;

			ring->sched.ready = false;



			if (ring == &adev->gfx.gfx_ring[0]) {

				/* oh, oh, that's really bad */

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

+9 −9
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_GFX:

		type = AMD_IP_BLOCK_TYPE_GFX;

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

			if (adev->gfx.gfx_ring[i].ready)

			if (adev->gfx.gfx_ring[i].sched.ready)

				++num_rings;

		ib_start_alignment = 32;

		ib_size_alignment = 32;
@@ -344,7 +344,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_COMPUTE:

		type = AMD_IP_BLOCK_TYPE_GFX;

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

			if (adev->gfx.compute_ring[i].ready)

			if (adev->gfx.compute_ring[i].sched.ready)

				++num_rings;

		ib_start_alignment = 32;

		ib_size_alignment = 32;
@@ -352,7 +352,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_DMA:

		type = AMD_IP_BLOCK_TYPE_SDMA;

		for (i = 0; i < adev->sdma.num_instances; i++)

			if (adev->sdma.instance[i].ring.ready)

			if (adev->sdma.instance[i].ring.sched.ready)

				++num_rings;

		ib_start_alignment = 256;

		ib_size_alignment = 4;
@@ -363,7 +363,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
			if (adev->uvd.harvest_config & (1 << i))

				continue;



			if (adev->uvd.inst[i].ring.ready)

			if (adev->uvd.inst[i].ring.sched.ready)

				++num_rings;

		}

		ib_start_alignment = 64;
@@ -372,7 +372,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_VCE:

		type = AMD_IP_BLOCK_TYPE_VCE;

		for (i = 0; i < adev->vce.num_rings; i++)

			if (adev->vce.ring[i].ready)

			if (adev->vce.ring[i].sched.ready)

				++num_rings;

		ib_start_alignment = 4;

		ib_size_alignment = 1;
@@ -384,7 +384,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
				continue;



			for (j = 0; j < adev->uvd.num_enc_rings; j++)

				if (adev->uvd.inst[i].ring_enc[j].ready)

				if (adev->uvd.inst[i].ring_enc[j].sched.ready)

					++num_rings;

		}

		ib_start_alignment = 64;
@@ -392,7 +392,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
		break;

	case AMDGPU_HW_IP_VCN_DEC:

		type = AMD_IP_BLOCK_TYPE_VCN;

		if (adev->vcn.ring_dec.ready)

		if (adev->vcn.ring_dec.sched.ready)

			++num_rings;

		ib_start_alignment = 16;

		ib_size_alignment = 16;
@@ -400,14 +400,14 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
	case AMDGPU_HW_IP_VCN_ENC:

		type = AMD_IP_BLOCK_TYPE_VCN;

		for (i = 0; i < adev->vcn.num_enc_rings; i++)

			if (adev->vcn.ring_enc[i].ready)

			if (adev->vcn.ring_enc[i].sched.ready)

				++num_rings;

		ib_start_alignment = 64;

		ib_size_alignment = 1;

		break;

	case AMDGPU_HW_IP_VCN_JPEG:

		type = AMD_IP_BLOCK_TYPE_VCN;

		if (adev->vcn.ring_jpeg.ready)

		if (adev->vcn.ring_jpeg.sched.ready)

			++num_rings;

		ib_start_alignment = 16;

		ib_size_alignment = 16;

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

+1 −1
Original line number Diff line number Diff line
@@ -2129,7 +2129,7 @@ void amdgpu_pm_compute_clocks(struct amdgpu_device *adev) 


	for (i = 0; i < AMDGPU_MAX_RINGS; i++) {

		struct amdgpu_ring *ring = adev->rings[i];

		if (ring && ring->ready)

		if (ring && ring->sched.ready)

			amdgpu_fence_wait_empty(ring);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE