Commit abf201f6 authored by Christian König's avatar Christian König

drm/sched: revert "Always increment correct scheduler score"

This reverts commit 087913e0.

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: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930131451.536150-1-christian.koenig@amd.com
parent 087913e0
...@@ -586,6 +586,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job) ...@@ -586,6 +586,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
ktime_t submit_ts; ktime_t submit_ts;
trace_drm_sched_job(sched_job, entity); trace_drm_sched_job(sched_job, entity);
atomic_inc(entity->rq->sched->score);
WRITE_ONCE(entity->last_user, current->group_leader); WRITE_ONCE(entity->last_user, current->group_leader);
/* /*
...@@ -613,7 +614,6 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job) ...@@ -613,7 +614,6 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job)
rq = entity->rq; rq = entity->rq;
sched = rq->sched; sched = rq->sched;
atomic_inc(sched->score);
drm_sched_rq_add_entity(rq, entity); drm_sched_rq_add_entity(rq, entity);
spin_unlock(&entity->rq_lock); spin_unlock(&entity->rq_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment