1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c
index 3e22a54a99c2..4463d3826ecb 100644
--- a/drivers/gpu/drm/scheduler/sched_entity.c
+++ b/drivers/gpu/drm/scheduler/sched_entity.c
@@ -130,7 +130,14 @@ drm_sched_entity_get_free_sched(struct drm_sched_entity *entity)
         int i;
 
         for (i = 0; i < entity->num_rq_list; ++i) {
-                num_jobs = atomic_read(&entity->rq_list[i]->sched->num_jobs);
+                struct drm_gpu_scheduler *sched = entity->rq_list[i]->sched;
+
+                if (!entity->rq_list[i]->sched->ready) {
+                        DRM_WARN("sched%s is not ready, skipping", sched->name);
+                        continue;
+                }
+
+                num_jobs = atomic_read(&sched->num_jobs);
                 if (num_jobs < min_jobs) {
                         min_jobs = num_jobs;
                         rq = entity->rq_list[i];
@@ -204,7 +211,6 @@ static void drm_sched_entity_kill_jobs_cb(struct dma_fence *f,
 
         drm_sched_fence_finished(job->s_fence);
         WARN_ON(job->s_fence->parent);
-        dma_fence_put(&job->s_fence->finished);
         job->sched->ops->free_job(job);
 }