drm/amdgpu/vce: set the priority for each ring
Subsystems (2)
PATCH v2 1/3 drm/amdgpu/vce: set the priority for each ring
VCE has multiple rings. Set the proper priority level for each ring while initializing.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 14 ++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 +++- 5 files changed, 24 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +14 -0
@@ -1168,3 +1168,17 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)amdgpu_bo_free_kernel (&bo,NULL ,NULL );return r; } + +enum amdgpu_ring_priority_level amdgpu_vce_get_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_vce.h +1 -0
@@ -71,5 +71,6 @@ void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring);void amdgpu_vce_ring_end_use (struct amdgpu_ring *ring);unsigned amdgpu_vce_ring_get_emit_ib_size (struct amdgpu_ring *ring);unsigned amdgpu_vce_ring_get_dma_frame_size (struct amdgpu_ring *ring); +enum amdgpu_ring_priority_level amdgpu_vce_get_ring_prio (int ring);#endif
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +3 -1
@@ -431,10 +431,12 @@ static int vce_v2_0_sw_init(void *handle)return r;for (i =0 ; i < adev->vce.num_rings; i++) { +unsigned int hw_prio =amdgpu_vce_get_ring_prio (i); + ring = &adev->vce.ring[i];sprintf (ring->name,"vce%d" , i); r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 , -AMDGPU_RING_PRIO_DEFAULT ,NULL ); + hw_prio,NULL );if (r)return r; }
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3 -1
@@ -440,10 +440,12 @@ static int vce_v3_0_sw_init(void *handle)return r;for (i =0 ; i < adev->vce.num_rings; i++) { +unsigned int hw_prio =amdgpu_vce_get_ring_prio (i); + ring = &adev->vce.ring[i];sprintf (ring->name,"vce%d" , i); r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 , -AMDGPU_RING_PRIO_DEFAULT ,NULL ); + hw_prio,NULL );if (r)return r; }
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +3 -1
@@ -463,6 +463,8 @@ static int vce_v4_0_sw_init(void *handle) }for (i =0 ; i < adev->vce.num_rings; i++) { +unsigned int hw_prio =amdgpu_vce_get_ring_prio (i); + ring = &adev->vce.ring[i];sprintf (ring->name,"vce%d" , i);if (amdgpu_sriov_vf (adev)) {
@@ -478,7 +480,7 @@ static int vce_v4_0_sw_init(void *handle) ring->doorbell_index = adev->doorbell_index.uvd_vce.vce_ring2_3 *2 +1 ; } r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 , -AMDGPU_RING_PRIO_DEFAULT ,NULL ); + hw_prio,NULL );if (r)return r; }
Signature · 1 line
2.25.1
PATCH v2 2/3 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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 14 ++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 ++ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 5 +++-- 6 files changed, 28 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +14 -0
@@ -951,3 +951,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
@@ -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
@@ -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) { +unsigned int 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
@@ -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) { +unsigned int 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
@@ -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) { +unsigned int 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; }
drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c +3 -2
@@ -227,6 +227,8 @@ static int vcn_v3_0_sw_init(void *handle)return r;for (j =0 ; j < adev->vcn.num_enc_rings; ++j) { +unsigned int hw_prio =amdgpu_vcn_get_enc_ring_prio (j); +/* VCN ENC TRAP */ r =amdgpu_irq_add_id (adev, amdgpu_ih_clientid_vcns[i], j +VCN_2_0__SRCID__UVD_ENC_GENERAL_PURPOSE , &adev->vcn.inst[i].irq);
@@ -242,8 +244,7 @@ static int vcn_v3_0_sw_init(void *handle) }sprintf (ring->name,"vcn_enc_%d.%d" , i, j); r =amdgpu_ring_init (adev, ring,512 , &adev->vcn.inst[i].irq,0 , -AMDGPU_RING_PRIO_DEFAULT , - &adev->vcn.inst[i].sched_score); + hw_prio, &adev->vcn.inst[i].sched_score);if (r)return r; }
Signature · 1 line
2.25.1
PATCH v2 3/3 drm/amdgpu:schedule vce/vcn encode based on priority
In reply to Satyajit SahuSchedule the encode job in VCE/VCN encode ring
based on the priority set by UMD.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +16 -0
@@ -120,6 +120,18 @@ static enum amdgpu_gfx_pipe_priority amdgpu_ctx_prio_to_compute_prio(int32_t pri } } +static enum amdgpu_ring_priority_level amdgpu_ctx_sched_prio_to_ring_prio (int32_t prio) +{ +switch (prio) { +case AMDGPU_CTX_PRIORITY_HIGH : +return AMDGPU_RING_PRIO_1 ; +case AMDGPU_CTX_PRIORITY_VERY_HIGH : +return AMDGPU_RING_PRIO_2 ; +default : +return AMDGPU_RING_PRIO_0 ; + } +} +static unsigned int amdgpu_ctx_get_hw_prio (struct amdgpu_ctx *ctx,u32 hw_ip) {struct amdgpu_device *adev = ctx->adev;
@@ -133,6 +145,10 @@ static unsigned int amdgpu_ctx_get_hw_prio(struct amdgpu_ctx *ctx, u32 hw_ip)case AMDGPU_HW_IP_COMPUTE : hw_prio =amdgpu_ctx_prio_to_compute_prio (ctx_prio);break ; +case AMDGPU_HW_IP_VCE : +case AMDGPU_HW_IP_VCN_ENC : + hw_prio =amdgpu_ctx_sched_prio_to_ring_prio (ctx_prio); +break ;default : hw_prio =AMDGPU_RING_PRIO_DEFAULT ;break ;
Signature · 1 line
2.25.1
Christian König
maintainerAm 27.08.21 um 14:42 schrieb Satyajit Sahu:
Quoted 50 lines
VCE has multiple rings. Set the proper priority level for each ring while initializing.
Signed-off-by Satyajit Sahu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 14 ++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 1 + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 4 +++- drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 4 +++- 5 files changed, 24 insertions(+), 3 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +14
-0@@ -1168,3 +1168,17 @@ int amdgpu_vce_ring_test_ib(struct amdgpu_ring *ring, long timeout)amdgpu_bo_free_kernel (&bo,NULL ,NULL );return r; } + +enum amdgpu_ring_priority_level amdgpu_vce_get_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_vce.h +1
-0@@ -71,5 +71,6 @@ void amdgpu_vce_ring_begin_use(struct amdgpu_ring *ring);void amdgpu_vce_ring_end_use (struct amdgpu_ring *ring);unsigned amdgpu_vce_ring_get_emit_ib_size (struct amdgpu_ring *ring);unsigned amdgpu_vce_ring_get_dma_frame_size (struct amdgpu_ring *ring); +enum amdgpu_ring_priority_level amdgpu_vce_get_ring_prio (int ring);#endif drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +0
-0
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c static int vce_v2_0_sw_init(void *handle) · line 434
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +1
-0@@ -431,10 +431,12 @@ static int vce_v2_0_sw_init(void *handle)return r;for (i =0 ; i < adev->vce.num_rings; i++) { +unsigned int hw_prio =amdgpu_vce_get_ring_prio (i);
This could use the enum name instead of unsigned int, but that's only a nit pick and not a must have.
The patches now lock really clean and simple to me now and the set is Reviewed-by: Christian König <[email protected]>
Regards,
Christian.
Quoted 49 lines
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +2
-1+ ring = &adev->vce.ring[i];sprintf (ring->name,"vce%d" , i); r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 , -AMDGPU_RING_PRIO_DEFAULT ,NULL ); + hw_prio,NULL );if (r)return r; }drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +3
-1@@ -440,10 +440,12 @@ static int vce_v3_0_sw_init(void *handle)return r;for (i =0 ; i < adev->vce.num_rings; i++) { +unsigned int hw_prio =amdgpu_vce_get_ring_prio (i); + ring = &adev->vce.ring[i];sprintf (ring->name,"vce%d" , i); r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 , -AMDGPU_RING_PRIO_DEFAULT ,NULL ); + hw_prio,NULL );if (r)return r; }drivers/gpu/drm/amd/amdgpu/vce_v4_0.c +3
-1@@ -463,6 +463,8 @@ static int vce_v4_0_sw_init(void *handle) }for (i =0 ; i < adev->vce.num_rings; i++) { +unsigned int hw_prio =amdgpu_vce_get_ring_prio (i); + ring = &adev->vce.ring[i];sprintf (ring->name,"vce%d" , i);if (amdgpu_sriov_vf (adev)) {@@ -478,7 +480,7 @@ static int vce_v4_0_sw_init(void *handle) ring->doorbell_index = adev->doorbell_index.uvd_vce.vce_ring2_3 *2 +1 ; } r =amdgpu_ring_init (adev, ring,512 , &adev->vce.irq,0 , -AMDGPU_RING_PRIO_DEFAULT ,NULL ); + hw_prio,NULL );if (r)return r; }