drm/panfrost: Remove commented out call to panfrost_core_dump

[linux.git] / drivers / gpu / drm / panfrost / panfrost_job.c

diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c
index a58551668d9aa8d5c452befbe1796d2f1f23b587..33bf25ba506eb26372b639c1d3d62c08dfcc8360 100644 (file)
--- a/drivers/gpu/drm/panfrost/panfrost_job.c
+++ b/drivers/gpu/drm/panfrost/panfrost_job.c
@@ -381,13 +381,19 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job)
                job_read(pfdev, JS_TAIL_LO(js)),
                sched_job);
 
-       mutex_lock(&pfdev->reset_lock);
+       if (!mutex_trylock(&pfdev->reset_lock))
+               return;
 
-       for (i = 0; i < NUM_JOB_SLOTS; i++)
-               drm_sched_stop(&pfdev->js->queue[i].sched, sched_job);
+       for (i = 0; i < NUM_JOB_SLOTS; i++) {
+               struct drm_gpu_scheduler *sched = &pfdev->js->queue[i].sched;
 
-       if (sched_job)
-               drm_sched_increase_karma(sched_job);
+               drm_sched_stop(sched, sched_job);
+               if (js != i)
+                       /* Ensure any timeouts on other slots have finished */
+                       cancel_delayed_work_sync(&sched->work_tdr);
+       }
+
+       drm_sched_increase_karma(sched_job);
 
        spin_lock_irqsave(&pfdev->js->job_lock, flags);
        for (i = 0; i < NUM_JOB_SLOTS; i++) {
@@ -398,8 +404,6 @@ static void panfrost_job_timedout(struct drm_sched_job *sched_job)
        }
        spin_unlock_irqrestore(&pfdev->js->job_lock, flags);
 
-       /* panfrost_core_dump(pfdev); */
-
        panfrost_devfreq_record_transition(pfdev, js);
        panfrost_device_reset(pfdev);