6.11-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian König christian.koenig@amd.com
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@amd.com Acked-by: Tvrtko Ursulin tvrtko.ursulin@igalia.com Link: https://patchwork.freedesktop.org/patch/msgid/20240930131451.536150-1-christ... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- 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);