Commit 0ad29a4e authored by Satyajit Sahu's avatar Satyajit Sahu Committed by Alex Deucher
Browse files

drm/amdgpu/vcn: set the priority for each encode ring 



VCN has multiple rings. Set the proper priority level for each
encode ring while initializing.

Signed-off-by: default avatarSatyajit Sahu <satyajit.sahu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 080e613c

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

+14 −0
Original line number Diff line number Diff line
@@ -949,3 +949,17 @@ int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout) 


	return r;

}



enum amdgpu_ring_priority_level amdgpu_vcn_get_enc_ring_prio(int ring)

{

	switch(ring) {

	case 0:

		return AMDGPU_RING_PRIO_0;

	case 1:

		return AMDGPU_RING_PRIO_1;

	case 2:

		return AMDGPU_RING_PRIO_2;

	default:

		return AMDGPU_RING_PRIO_0;

	}

}

drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h

+2 −0
Original line number Diff line number Diff line
@@ -308,4 +308,6 @@ int amdgpu_vcn_dec_sw_ring_test_ib(struct amdgpu_ring *ring, long timeout); 
int amdgpu_vcn_enc_ring_test_ring(struct amdgpu_ring *ring);

int amdgpu_vcn_enc_ring_test_ib(struct amdgpu_ring *ring, long timeout);



enum amdgpu_ring_priority_level amdgpu_vcn_get_enc_ring_prio(int ring);



#endif

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

+3 −1
Original line number Diff line number Diff line
@@ -145,10 +145,12 @@ static int vcn_v1_0_sw_init(void *handle) 
		SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP);



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

		enum amdgpu_ring_priority_level hw_prio = amdgpu_vcn_get_enc_ring_prio(i);



		ring = &adev->vcn.inst->ring_enc[i];

		sprintf(ring->name, "vcn_enc%d", i);

		r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.inst->irq, 0,

				     AMDGPU_RING_PRIO_DEFAULT, NULL);

				     hw_prio, NULL);

		if (r)

			return r;

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ static int vcn_v2_0_sw_init(void *handle) 
	adev->vcn.inst->external.nop = SOC15_REG_OFFSET(UVD, 0, mmUVD_NO_OP);



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

		enum amdgpu_ring_priority_level hw_prio = amdgpu_vcn_get_enc_ring_prio(i);



		ring = &adev->vcn.inst->ring_enc[i];

		ring->use_doorbell = true;

		if (!amdgpu_sriov_vf(adev))
@@ -167,7 +169,7 @@ static int vcn_v2_0_sw_init(void *handle) 
			ring->doorbell_index = (adev->doorbell_index.vcn.vcn_ring0_1 << 1) + 1 + i;

		sprintf(ring->name, "vcn_enc%d", i);

		r = amdgpu_ring_init(adev, ring, 512, &adev->vcn.inst->irq, 0,

				     AMDGPU_RING_PRIO_DEFAULT, NULL);

				     hw_prio, NULL);

		if (r)

			return r;

	}

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

+3 −1
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ static int vcn_v2_5_sw_init(void *handle) 
			return r;



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

			enum amdgpu_ring_priority_level hw_prio = amdgpu_vcn_get_enc_ring_prio(i);



			ring = &adev->vcn.inst[j].ring_enc[i];

			ring->use_doorbell = true;
@@ -203,7 +205,7 @@ static int vcn_v2_5_sw_init(void *handle) 
			sprintf(ring->name, "vcn_enc_%d.%d", j, i);

			r = amdgpu_ring_init(adev, ring, 512,

					     &adev->vcn.inst[j].irq, 0,

					     AMDGPU_RING_PRIO_DEFAULT, NULL);

					     hw_prio, NULL);

			if (r)

				return r;

		}