When entity move from one rq to another, current_entity will be set to NULL if it is the moving entity. This make entities close to rq head got selected more frequently, especially when doing load balance between multiple drm_gpu_scheduler. Make current_entity to next when removing from rq. Signed-off-by: brolerliew <brolerliew@xxxxxxxxx> --- drivers/gpu/drm/scheduler/sched_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 2fab218d7082..00b22cc50f08 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -168,10 +168,11 @@ void drm_sched_rq_remove_entity(struct drm_sched_rq *rq, spin_lock(&rq->lock); atomic_dec(rq->sched->score); - list_del_init(&entity->list); if (rq->current_entity == entity) - rq->current_entity = NULL; + rq->current_entity = list_next_entry(entity, list); + + list_del_init(&entity->list); if (drm_sched_policy == DRM_SCHED_POLICY_FIFO) drm_sched_rq_remove_fifo_locked(entity); -- 2.34.1
