drm/sched: revert "Always increment correct scheduler score"
commitabf201f6ceupstream. This reverts commit087913e0ba. 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>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
5357141b4c
commit
557f2985c5
@@ -586,6 +586,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
|
||||
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 drm_sched_job *sched_job)
|
||||
rq = entity->rq;
|
||||
sched = rq->sched;
|
||||
|
||||
atomic_inc(sched->score);
|
||||
drm_sched_rq_add_entity(rq, entity);
|
||||
spin_unlock(&entity->rq_lock);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user