drm/scheduler: rework entity creation
Subsystems (8)
DRM drivers DRM misc Radeon and amdgpu DRM drivers DRM drivers for vivante GPU IP +4 more subsystems
PATCH v3 1/1 drm/scheduler: rework entity creation
Entity currently keeps a copy of run_queue list and modify it in drm_sched_entity_set_priority(). Entities shouldn't modify run_queue list. Use drm_gpu_scheduler list instead of drm_sched_rq list in drm_sched_entity struct. In this way we can select a runqueue based on entity/ctx's priority for a drm scheduler.
Signed-off-by Nirmoy Das <[email protected]>
Reviewed-by Christian König <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 7 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 7 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 7 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 14 +++-- drivers/gpu/drm/etnaviv/etnaviv_drv.c | 7 ++- drivers/gpu/drm/lima/lima_sched.c | 5 +- drivers/gpu/drm/panfrost/panfrost_job.c | 8 ++- drivers/gpu/drm/scheduler/sched_entity.c | 74 ++++++++++-------------- drivers/gpu/drm/v3d/v3d_drv.c | 8 ++- include/drm/gpu_scheduler.h | 8 ++- 11 files changed, 78 insertions(+), 75 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +4 -3
@@ -122,7 +122,7 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,for (i =0 ; i <AMDGPU_HW_IP_NUM ; ++i) {struct amdgpu_ring *rings[AMDGPU_MAX_RINGS ]; -struct drm_sched_rq *rqs[AMDGPU_MAX_RINGS ]; +struct drm_gpu_scheduler *sched_list[AMDGPU_MAX_RINGS ];unsigned num_rings =0 ;unsigned num_rqs =0 ;
@@ -181,12 +181,13 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev,if (!rings[j]->adev)continue ; - rqs[num_rqs++] = &rings[j]->sched.sched_rq[priority]; + sched_list[num_rqs++] = &rings[j]->sched; }for (j =0 ; j < amdgpu_ctx_num_entities[i]; ++j) r =drm_sched_entity_init (&ctx->entities[i][j].entity, - rqs, num_rqs, &ctx->guilty); + priority, sched_list, + num_rqs, &ctx->guilty);if (r) goto error_cleanup_entities; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -3
@@ -1957,11 +1957,13 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable)if (enable) {struct amdgpu_ring *ring; -struct drm_sched_rq *rq; +struct drm_gpu_scheduler *sched; ring = adev->mman.buffer_funcs_ring; - rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_KERNEL ]; - r =drm_sched_entity_init (&adev->mman.entity, &rq,1 ,NULL ); + sched = &ring->sched; + r =drm_sched_entity_init (&adev->mman.entity, +DRM_SCHED_PRIORITY_KERNEL , &sched, +1 ,NULL );if (r) {DRM_ERROR ("Failed setting up TTM BO move entity (%d)\n" , r);
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +4 -3
@@ -330,12 +330,13 @@ int amdgpu_uvd_sw_fini(struct amdgpu_device *adev)int amdgpu_uvd_entity_init (struct amdgpu_device *adev) {struct amdgpu_ring *ring; -struct drm_sched_rq *rq; +struct drm_gpu_scheduler *sched;int r; ring = &adev->uvd.inst[0 ].ring; - rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL ]; - r =drm_sched_entity_init (&adev->uvd.entity, &rq,1 ,NULL ); + sched = &ring->sched; + r =drm_sched_entity_init (&adev->uvd.entity,DRM_SCHED_PRIORITY_NORMAL , + &sched,1 ,NULL );if (r) {DRM_ERROR ("Failed setting up UVD kernel entity.\n" );return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +4 -3
@@ -240,12 +240,13 @@ int amdgpu_vce_sw_fini(struct amdgpu_device *adev)int amdgpu_vce_entity_init (struct amdgpu_device *adev) {struct amdgpu_ring *ring; -struct drm_sched_rq *rq; +struct drm_gpu_scheduler *sched;int r; ring = &adev->vce.ring[0 ]; - rq = &ring->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL ]; - r =drm_sched_entity_init (&adev->vce.entity, &rq,1 ,NULL ); + sched = &ring->sched; + r =drm_sched_entity_init (&adev->vce.entity,DRM_SCHED_PRIORITY_NORMAL , + &sched,1 ,NULL );if (r !=0 ) {DRM_ERROR ("Failed setting up VCE run queue.\n" );return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +10 -4
@@ -2687,6 +2687,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm, {struct amdgpu_bo_param bp;struct amdgpu_bo *root; +struct drm_gpu_scheduler *sched_list[AMDGPU_MAX_RINGS ];int r, i; vm->va =RB_ROOT_CACHED ;
@@ -2700,14 +2701,19 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm,spin_lock_init (&vm->invalidated_lock);INIT_LIST_HEAD (&vm->freed); +for (i =0 ; i < adev->vm_manager.vm_pte_num_rqs; i++) + sched_list[i] = adev->vm_manager.vm_pte_rqs[i]->sched; +/* create scheduler entities for page table updates */ - r =drm_sched_entity_init (&vm->direct, adev->vm_manager.vm_pte_rqs, - adev->vm_manager.vm_pte_num_rqs,NULL ); + r =drm_sched_entity_init (&vm->direct,DRM_SCHED_PRIORITY_NORMAL , + sched_list, adev->vm_manager.vm_pte_num_rqs, +NULL );if (r)return r; - r =drm_sched_entity_init (&vm->delayed, adev->vm_manager.vm_pte_rqs, - adev->vm_manager.vm_pte_num_rqs,NULL ); + r =drm_sched_entity_init (&vm->delayed,DRM_SCHED_PRIORITY_NORMAL , + sched_list, adev->vm_manager.vm_pte_num_rqs, +NULL );if (r) goto error_free_direct;
drivers/gpu/drm/etnaviv/etnaviv_drv.c +4 -3
@@ -65,12 +65,13 @@ static int etnaviv_open(struct drm_device *dev, struct drm_file *file)for (i =0 ; i <ETNA_MAX_PIPES ; i++) {struct etnaviv_gpu *gpu = priv->gpu[i]; -struct drm_sched_rq *rq; +struct drm_gpu_scheduler *sched;if (gpu) { - rq = &gpu->sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL ]; + sched = &gpu->sched;drm_sched_entity_init (&ctx->sched_entity[i], - &rq,1 ,NULL ); +DRM_SCHED_PRIORITY_NORMAL , &sched, +1 ,NULL ); } }
drivers/gpu/drm/lima/lima_sched.c +3 -2
@@ -159,9 +159,10 @@ int lima_sched_context_init(struct lima_sched_pipe *pipe,struct lima_sched_context *context, atomic_t *guilty) { - struct drm_sched_rq *rq = pipe->base.sched_rq + DRM_SCHED_PRIORITY_NORMAL; + struct drm_gpu_scheduler *sched = &pipe->base; -return drm_sched_entity_init (&context->base, &rq,1 , guilty); +return drm_sched_entity_init (&context->base,DRM_SCHED_PRIORITY_NORMAL , + &sched,1 , guilty); } void lima_sched_context_fini(struct lima_sched_pipe *pipe,
drivers/gpu/drm/panfrost/panfrost_job.c +5 -3
@@ -542,12 +542,14 @@ int panfrost_job_open(struct panfrost_file_priv *panfrost_priv) {struct panfrost_device *pfdev = panfrost_priv->pfdev;struct panfrost_job_slot *js = pfdev->js; -struct drm_sched_rq *rq; +struct drm_gpu_scheduler *sched;int ret, i;for (i =0 ; i <NUM_JOB_SLOTS ; i++) { - rq = &js->queue[i].sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL ]; - ret =drm_sched_entity_init (&panfrost_priv->sched_entity[i], &rq,1 ,NULL ); + sched = &js->queue[i].sched; + ret =drm_sched_entity_init (&panfrost_priv->sched_entity[i], +DRM_SCHED_PRIORITY_NORMAL , &sched, +1 ,NULL ,DRM_SCHED_PRIORITY_NORMAL );if (WARN_ON (ret))return ret; }
drivers/gpu/drm/scheduler/sched_entity.c +29 -45
148 lines not on this page · raw message
drivers/gpu/drm/v3d/v3d_drv.c +5 -3
@@ -140,7 +140,7 @@ v3d_open(struct drm_device *dev, struct drm_file *file) {struct v3d_dev *v3d =to_v3d_dev (dev);struct v3d_file_priv *v3d_priv; -struct drm_sched_rq *rq; +struct drm_gpu_scheduler *sched;int i; v3d_priv =kzalloc (sizeof (*v3d_priv),GFP_KERNEL );
@@ -150,8 +150,10 @@ v3d_open(struct drm_device *dev, struct drm_file *file) v3d_priv->v3d = v3d;for (i =0 ; i <V3D_MAX_QUEUES ; i++) { - rq = &v3d->queue[i].sched.sched_rq[DRM_SCHED_PRIORITY_NORMAL ]; -drm_sched_entity_init (&v3d_priv->sched_entity[i], &rq,1 ,NULL ); + sched = &v3d->queue[i].sched; +drm_sched_entity_init (&v3d_priv->sched_entity[i], +DRM_SCHED_PRIORITY_NORMAL , &sched, +1 ,NULL ); } file->driver_priv = v3d_priv;
include/drm/gpu_scheduler.h +5 -3
@@ -81,8 +81,9 @@ enum drm_sched_priority {struct drm_sched_entity {struct list_head list;struct drm_sched_rq *rq; -struct drm_sched_rq **rq_list; -unsigned int num_rq_list; +unsigned int num_sched_list; +struct drm_gpu_scheduler **sched_list; +enum drm_sched_priority priority;spinlock_t rq_lock;struct spsc_queue job_queue;
@@ -312,7 +313,8 @@ void drm_sched_rq_remove_entity(struct drm_sched_rq *rq, struct drm_sched_entity *entity);int drm_sched_entity_init (struct drm_sched_entity *entity, -struct drm_sched_rq **rq_list, +enum drm_sched_priority priority, +struct drm_gpu_scheduler **sched_list,unsigned int num_rq_list,atomic_t *guilty);long drm_sched_entity_flush (struct drm_sched_entity *entity,long timeout);
Signature · 6 lines
2.23.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx