From: Christian König <christian.koenig@xxxxxxx> commit abf201f6ce14c4ceeccde5471bdf59614b83a3d8 upstream. This reverts commit 087913e0ba2b3b9d7ccbafb2acf5dab9e35ae1d5. It turned out that the original code was correct since the rq can only change when there is no armed job for an entity. This change here broke the logic since we only incremented the counter for the first job, so revert it. Signed-off-by: Christian König <christian.koenig@xxxxxxx> Acked-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/20240930131451.536150-1-christian.koenig@xxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/scheduler/sched_entity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -586,6 +586,7 @@ void drm_sched_entity_push_job(struct dr ktime_t submit_ts; trace_drm_sched_job(sched_job, entity); + atomic_inc(entity->rq->sched->score); WRITE_ONCE(entity->last_user, current->group_leader); /* @@ -613,7 +614,6 @@ void drm_sched_entity_push_job(struct dr rq = entity->rq; sched = rq->sched; - atomic_inc(sched->score); drm_sched_rq_add_entity(rq, entity); spin_unlock(&entity->rq_lock); Patches currently in stable-queue which might be from christian.koenig@xxxxxxx are queue-6.11/drm-amdgpu-gfx12-properly-handle-error-ints-on-all-p.patch queue-6.11/drm-sched-always-increment-correct-scheduler-score.patch queue-6.11/drm-amdkfd-amdkfd_free_gtt_mem-clear-the-correct-poi.patch queue-6.11/drm-amdgpu-gfx9-properly-handle-error-ints-on-all-pi.patch queue-6.11/drm-sched-revert-always-increment-correct-scheduler-score.patch queue-6.11/drm-sched-always-wake-up-correct-scheduler-in-drm_sched_entity_push_job.patch queue-6.11/drm-amdgpu-disallow-multiple-bo_handles-chunks-in-on.patch queue-6.11/drm-sched-add-locking-to-drm_sched_entity_modify_sched.patch
