drm/amdgpu: disable gpu_sched load balancer for vcn jobs
Subsystems (2)
PATCH 1/1 drm/amdgpu: disable gpu_sched load balancer for vcn jobs
VCN HW doesn't support dynamic load balance on multiple instances for a context. This patch modifies entity's sched_list to a sched_list consist of only one drm scheduler.
Signed-off-by Nirmoy Das <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 ++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 ++ drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 ++ 8 files changed, 29 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +4 -0
@@ -1203,6 +1203,7 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, union drm_amdgpu_cs *cs) {struct amdgpu_fpriv *fpriv = p->filp->driver_priv; +struct amdgpu_ring *ring =to_amdgpu_ring (p->entity->rq->sched);struct drm_sched_entity *entity = p->entity;enum drm_sched_priority priority;struct amdgpu_bo_list_entry *e;
@@ -1257,6 +1258,9 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity); +if (ring->funcs->no_gpu_sched_loadbalance) +amdgpu_ctx_disable_gpu_sched_load_balance (entity); +amdgpu_vm_move_to_lru_tail (p->adev, &fpriv->vm);ttm_eu_fence_buffer_objects (&p->ticket, &p->validated, p->fence);
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +14 -0
@@ -559,6 +559,20 @@ void amdgpu_ctx_priority_override(struct amdgpu_ctx *ctx, } } +/** +* amdgpu_ctx_disable_gpu_sched_load_balance - disable gpu_sched's load balancer +* @entity: entity on which load balancer will be disabled +*/ +void amdgpu_ctx_disable_gpu_sched_load_balance (struct drm_sched_entity *entity) +{ +struct drm_gpu_scheduler **scheds = &entity->rq->sched; + +/* disable gpu_sched's job load balancer by assigning only one */ +/* drm scheduler to the entity */ +drm_sched_entity_modify_sched (entity, scheds,1 ); + +} +int amdgpu_ctx_wait_prev_fence (struct amdgpu_ctx *ctx,struct drm_sched_entity *entity) {
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h +1 -0
@@ -90,5 +90,6 @@ void amdgpu_ctx_mgr_fini(struct amdgpu_ctx_mgr *mgr);void amdgpu_ctx_init_sched (struct amdgpu_device *adev); +void amdgpu_ctx_disable_gpu_sched_load_balance (struct drm_sched_entity *entity);#endif
drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +3 -0
@@ -140,6 +140,7 @@ void amdgpu_job_free(struct amdgpu_job *job)int amdgpu_job_submit (struct amdgpu_job *job,struct drm_sched_entity *entity,void *owner,struct dma_fence **f) { +struct amdgpu_ring *ring =to_amdgpu_ring (entity->rq->sched);enum drm_sched_priority priority;int r;
@@ -154,6 +155,8 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity,amdgpu_job_free_resources (job); priority = job->base.s_priority;drm_sched_entity_push_job (&job->base, entity); +if (ring->funcs->no_gpu_sched_loadbalance) +amdgpu_ctx_disable_gpu_sched_load_balance (entity);return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +1 -0
@@ -115,6 +115,7 @@ struct amdgpu_ring_funcs {u32 nop;bool support_64bit_ptrs;bool no_user_fence; +bool no_gpu_sched_loadbalance;unsigned vmhub;unsigned extra_dw;
drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c +2 -0
@@ -1871,6 +1871,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_dec_ring_vm_funcs = { .align_mask = 0xf, .support_64bit_ptrs = false, .no_user_fence = true, + .no_gpu_sched_loadbalance = true, .vmhub = AMDGPU_MMHUB_0, .get_rptr = vcn_v1_0_dec_ring_get_rptr, .get_wptr = vcn_v1_0_dec_ring_get_wptr,
@@ -1905,6 +1906,7 @@ static const struct amdgpu_ring_funcs vcn_v1_0_enc_ring_vm_funcs = { .nop = VCN_ENC_CMD_NO_OP, .support_64bit_ptrs = false, .no_user_fence = true, + .no_gpu_sched_loadbalance = true, .vmhub = AMDGPU_MMHUB_0, .get_rptr = vcn_v1_0_enc_ring_get_rptr, .get_wptr = vcn_v1_0_enc_ring_get_wptr,
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c +2 -0
@@ -1954,6 +1954,7 @@ static const struct amd_ip_funcs vcn_v2_0_ip_funcs = {static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf , + .no_gpu_sched_loadbalance = true, .vmhub =AMDGPU_MMHUB_0 , .get_rptr = vcn_v2_0_dec_ring_get_rptr, .get_wptr = vcn_v2_0_dec_ring_get_wptr,
@@ -1984,6 +1985,7 @@ static const struct amdgpu_ring_funcs vcn_v2_0_dec_ring_vm_funcs = {static const struct amdgpu_ring_funcs vcn_v2_0_enc_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_ENC , .align_mask =0x3f , + .no_gpu_sched_loadbalance = true, .nop =VCN_ENC_CMD_NO_OP , .vmhub =AMDGPU_MMHUB_0 , .get_rptr = vcn_v2_0_enc_ring_get_rptr,
drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c +2 -0
@@ -1478,6 +1478,7 @@ static void vcn_v2_5_dec_ring_set_wptr(struct amdgpu_ring *ring)static const struct amdgpu_ring_funcs vcn_v2_5_dec_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_DEC , .align_mask =0xf , + .no_gpu_sched_loadbalance = true, .vmhub =AMDGPU_MMHUB_1 , .get_rptr = vcn_v2_5_dec_ring_get_rptr, .get_wptr = vcn_v2_5_dec_ring_get_wptr,
@@ -1577,6 +1578,7 @@ static void vcn_v2_5_enc_ring_set_wptr(struct amdgpu_ring *ring)static const struct amdgpu_ring_funcs vcn_v2_5_enc_ring_vm_funcs = { .type =AMDGPU_RING_TYPE_VCN_ENC , .align_mask =0x3f , + .no_gpu_sched_loadbalance = true, .nop =VCN_ENC_CMD_NO_OP , .vmhub =AMDGPU_MMHUB_1 , .get_rptr = vcn_v2_5_enc_ring_get_rptr,
Signature · 6 lines
2.25.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx