renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 04:33:58 +08:00
Code

Revert "drm/scheduler: improve job distribution with multiple queues"

Browse Source 
It needs to revert this patch to avoid amdgpu_test compute hang problem
on picasso.

This reverts commit 56822db194.

Signed-off-by: changzhu <Changfeng.Zhu@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
changzhu 2020-03-11 19:12:52 +08:00 committed by Alex Deucher
parent 9015d60c9e
commit d164bebb95
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/gpu/drm/scheduler/sched_entity.c
View File

@ -148,7 +148,7 @@ static struct drm_sched_rq *
drm_sched_entity_get_free_sched(struct drm_sched_entity *entity) drm_sched_entity_get_free_sched(struct drm_sched_entity *entity)
{ {
struct drm_sched_rq *rq = NULL; struct drm_sched_rq *rq = NULL;
unsigned int min_score = UINT_MAX, num_score; unsigned int min_jobs = UINT_MAX, num_jobs;
int i; int i;
for (i = 0; i < entity->num_sched_list; ++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; continue;
} }
num_score = atomic_read(&sched->score); num_jobs = atomic_read(&sched->num_jobs);
if (num_score < min_score) { if (num_jobs < min_jobs) {
min_score = num_score; min_jobs = num_jobs;
rq = &entity->sched_list[i]->sched_rq[entity->priority]; 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; bool first;
trace_drm_sched_job(sched_job, entity); 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); WRITE_ONCE(entity->last_user, current->group_leader);
first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node); first = spsc_queue_push(&entity->job_queue, &sched_job->queue_node);

6
drivers/gpu/drm/scheduler/sched_main.c
View File

@ -92,7 +92,6 @@ void drm_sched_rq_add_entity(struct drm_sched_rq *rq,
if (!list_empty(&entity->list)) if (!list_empty(&entity->list))
return; return;
spin_lock(&rq->lock); spin_lock(&rq->lock);
atomic_inc(&rq->sched->score);
list_add_tail(&entity->list, &rq->entities); list_add_tail(&entity->list, &rq->entities);
spin_unlock(&rq->lock); spin_unlock(&rq->lock);
} }
@ -111,7 +110,6 @@ void drm_sched_rq_remove_entity(struct drm_sched_rq *rq,
if (list_empty(&entity->list)) if (list_empty(&entity->list))
return; return;
spin_lock(&rq->lock); spin_lock(&rq->lock);
atomic_dec(&rq->sched->score);
list_del_init(&entity->list); list_del_init(&entity->list);
if (rq->current_entity == entity) if (rq->current_entity == entity)
rq->current_entity = NULL; rq->current_entity = NULL;
@ -649,7 +647,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb)
struct drm_gpu_scheduler *sched = s_fence->sched; struct drm_gpu_scheduler *sched = s_fence->sched;
atomic_dec(&sched->hw_rq_count); atomic_dec(&sched->hw_rq_count);
atomic_dec(&sched->score); atomic_dec(&sched->num_jobs);
trace_drm_sched_process_job(s_fence); trace_drm_sched_process_job(s_fence);
@ -824,7 +822,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
spin_lock_init(&sched->job_list_lock); spin_lock_init(&sched->job_list_lock);
atomic_set(&sched->hw_rq_count, 0); atomic_set(&sched->hw_rq_count, 0);
INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout); INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout);
atomic_set(&sched->score, 0); atomic_set(&sched->num_jobs, 0);
atomic64_set(&sched->job_id_count, 0); atomic64_set(&sched->job_id_count, 0);
/* Each scheduler will run on a seperate kernel thread */ /* Each scheduler will run on a seperate kernel thread */

4
include/drm/gpu_scheduler.h
View File

@ -262,7 +262,7 @@ struct drm_sched_backend_ops {
* @job_list_lock: lock to protect the ring_mirror_list. * @job_list_lock: lock to protect the ring_mirror_list.
* @hang_limit: once the hangs by a job crosses this limit then it is marked * @hang_limit: once the hangs by a job crosses this limit then it is marked
* guilty and it will be considered for scheduling further. * guilty and it will be considered for scheduling further.
* @score: score to help loadbalancer pick a idle sched * @num_jobs: the number of jobs in queue in the scheduler
* @ready: marks if the underlying HW is ready to work * @ready: marks if the underlying HW is ready to work
* @free_guilty: A hit to time out handler to free the guilty job. * @free_guilty: A hit to time out handler to free the guilty job.
* *
@ -283,7 +283,7 @@ struct drm_gpu_scheduler {
struct list_head ring_mirror_list; struct list_head ring_mirror_list;
spinlock_t job_list_lock; spinlock_t job_list_lock;
int hang_limit; int hang_limit;
atomic_t score; atomic_t num_jobs;
bool ready; bool ready;
bool free_guilty; bool free_guilty;
}; };