From d164bebb95516c9dd2a63cf8c8e9fe0b13d7474e Mon Sep 17 00:00:00 2001 From: changzhu Date: Wed, 11 Mar 2020 19:12:52 +0800 Subject: Revert "drm/scheduler: improve job distribution with multiple queues" It needs to revert this patch to avoid amdgpu_test compute hang problem on picasso. This reverts commit 56822db194232c089601728d68ed078dccb97f8b. Signed-off-by: changzhu Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher --- drivers/gpu/drm/scheduler/sched_entity.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/drm/scheduler/sched_entity.c') diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 90fd9c30ae5a..d631521a9679 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -148,7 +148,7 @@ static struct drm_sched_rq * drm_sched_entity_get_free_sched(struct drm_sched_entity *entity) { struct drm_sched_rq *rq = NULL; - unsigned int min_score = UINT_MAX, num_score; + unsigned int min_jobs = UINT_MAX, num_jobs; int i; for (i = 0; i < entity->num_sched_list; ++i) { @@ -159,9 +159,9 @@ drm_sched_entity_get_free_sched(struct drm_sched_entity *entity) continue; } - num_score = atomic_read(&sched->score); - if (num_score < min_score) { - min_score = num_score; + num_jobs = atomic_read(&sched->num_jobs); + if (num_jobs < min_jobs) { + min_jobs = num_jobs; rq = &entity->sched_list[i]->sched_rq[entity->priority]; } } @@ -516,7 +516,7 @@ void drm_sched_entity_push_job(struct drm_sched_job *sched_job, bool first; trace_drm_sched_job(sched_job, entity); - atomic_inc(&entity->rq->sched->score); + atomic_inc(&entity->rq->sched->num_jobs); WRITE_ONCE(entity->last_user, current->group_leader); first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node); -- cgit v1.2.3-70-g09d2