Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 557f298

Browse files
ChristianKoenigAMDgregkh
authored andcommitted
drm/sched: revert "Always increment correct scheduler score"
commit abf201f upstream. This reverts commit 087913e. 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-christian.koenig@amd.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 5357141 commit 557f298

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/gpu/drm/scheduler/sched_entity.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
586586
ktime_t submit_ts;
587587

588588
trace_drm_sched_job(sched_job, entity);
589+
atomic_inc(entity->rq->sched->score);
589590
WRITE_ONCE(entity->last_user, current->group_leader);
590591

591592
/*
@@ -613,7 +614,6 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
613614
rq = entity->rq;
614615
sched = rq->sched;
615616

616-
atomic_inc(sched->score);
617617
drm_sched_rq_add_entity(rq, entity);
618618
spin_unlock(&entity->rq_lock);
619619

0 commit comments

Comments
 (0)