[PATCH v2 6/9] drm/sched: Add drm_sched_start_timeout_unlocked helper

[Matthew Brost]

Also add a lockdep assert to drm_sched_start_timeout.

Signed-off-by: Matthew Brost <matthew.br...@intel.com>
---
 drivers/gpu/drm/scheduler/sched_main.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/scheduler/sched_main.c 
b/drivers/gpu/drm/scheduler/sched_main.c
index fbd99f7e5b4a..d5f6d86985c5 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -412,11 +412,20 @@ static void drm_sched_job_done_cb(struct dma_fence *f, 
struct dma_fence_cb *cb)
  */
 static void drm_sched_start_timeout(struct drm_gpu_scheduler *sched)
 {
+       lockdep_assert_held(&sched->job_list_lock);
+
        if (sched->timeout != MAX_SCHEDULE_TIMEOUT &&
            !list_empty(&sched->pending_list))
                queue_delayed_work(sched->timeout_wq, &sched->work_tdr, 
sched->timeout);
 }
 
+static void drm_sched_start_timeout_unlocked(struct drm_gpu_scheduler *sched)
+{
+       spin_lock(&sched->job_list_lock);
+       drm_sched_start_timeout(sched);
+       spin_unlock(&sched->job_list_lock);
+}
+
 /**
  * drm_sched_fault - immediately start timeout handler
  *
@@ -529,11 +538,8 @@ static void drm_sched_job_timedout(struct work_struct 
*work)
                spin_unlock(&sched->job_list_lock);
        }
 
-       if (status != DRM_GPU_SCHED_STAT_ENODEV) {
-               spin_lock(&sched->job_list_lock);
-               drm_sched_start_timeout(sched);
-               spin_unlock(&sched->job_list_lock);
-       }
+       if (status != DRM_GPU_SCHED_STAT_ENODEV)
+               drm_sched_start_timeout_unlocked(sched);
 }
 
 /**
@@ -659,11 +665,8 @@ void drm_sched_start(struct drm_gpu_scheduler *sched, bool 
full_recovery)
                        drm_sched_job_done(s_job, -ECANCELED);
        }
 
-       if (full_recovery) {
-               spin_lock(&sched->job_list_lock);
-               drm_sched_start_timeout(sched);
-               spin_unlock(&sched->job_list_lock);
-       }
+       if (full_recovery)
+               drm_sched_start_timeout_unlocked(sched);
 
        drm_sched_submit_start(sched);
 }
-- 
2.34.1