Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

[linux-block.git] / drivers / gpu / drm / scheduler / sched_main.c

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 2f319102ae9f7f39366f54a6ccfe52812af8e9b9..d6eaa23ad746b9c9d6ec8357ddabb8f858719b5c 100644 (file)
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -92,6 +92,7 @@ void drm_sched_rq_add_entity(struct drm_sched_rq *rq,
        if (!list_empty(&entity->list))
                return;
        spin_lock(&rq->lock);
+       atomic_inc(&rq->sched->score);
        list_add_tail(&entity->list, &rq->entities);
        spin_unlock(&rq->lock);
 }
@@ -110,6 +111,7 @@ void drm_sched_rq_remove_entity(struct drm_sched_rq *rq,
        if (list_empty(&entity->list))
                return;
        spin_lock(&rq->lock);
+       atomic_dec(&rq->sched->score);
        list_del_init(&entity->list);
        if (rq->current_entity == entity)
                rq->current_entity = NULL;
@@ -647,7 +649,7 @@ static void drm_sched_process_job(struct dma_fence *f, struct dma_fence_cb *cb)
        struct drm_gpu_scheduler *sched = s_fence->sched;
 
        atomic_dec(&sched->hw_rq_count);
-       atomic_dec(&sched->num_jobs);
+       atomic_dec(&sched->score);
 
        trace_drm_sched_process_job(s_fence);
 
@@ -712,7 +714,7 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,
 {
        struct drm_gpu_scheduler *sched, *picked_sched = NULL;
        int i;
-       unsigned int min_jobs = UINT_MAX, num_jobs;
+       unsigned int min_score = UINT_MAX, num_score;
 
        for (i = 0; i < num_sched_list; ++i) {
                sched = sched_list[i];
@@ -723,9 +725,9 @@ drm_sched_pick_best(struct drm_gpu_scheduler **sched_list,
                        continue;
                }
 
-               num_jobs = atomic_read(&sched->num_jobs);
-               if (num_jobs < min_jobs) {
-                       min_jobs = num_jobs;
+               num_score = atomic_read(&sched->score);
+               if (num_score < min_score) {
+                       min_score = num_score;
                        picked_sched = sched;
                }
        }
@@ -860,7 +862,7 @@ int drm_sched_init(struct drm_gpu_scheduler *sched,
        spin_lock_init(&sched->job_list_lock);
        atomic_set(&sched->hw_rq_count, 0);
        INIT_DELAYED_WORK(&sched->work_tdr, drm_sched_job_timedout);
-       atomic_set(&sched->num_jobs, 0);
+       atomic_set(&sched->score, 0);
        atomic64_set(&sched->job_id_count, 0);
 
        /* Each scheduler will run on a seperate kernel thread */