From: Rob Clark <robdcl...@chromium.org>
Cancel the timer when the GPU is idle, but also remember to restart it
in the recover path if we've re-submitted submits following the one that
hung.
Signed-off-by: Rob Clark <robdcl...@chromium.org>
---
drivers/gpu/drm/msm/msm_gpu.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c
index 0d56699297c7..367f0c698b40 100644
--- a/drivers/gpu/drm/msm/msm_gpu.c
+++ b/drivers/gpu/drm/msm/msm_gpu.c
@@ -16,6 +16,8 @@
#include <linux/devcoredump.h>
#include <linux/sched/task.h>
+static void hangcheck_timer_reset(struct msm_gpu *gpu);
+
/*
* Power Management:
*/
@@ -450,6 +452,10 @@ static void recover_worker(struct kthread_work *work)
gpu->funcs->submit(gpu, submit);
spin_unlock_irqrestore(&ring->submit_lock, flags);
}
+
+ hangcheck_timer_reset(gpu);
+ } else {
+ del_timer(&gpu->hangcheck_timer);
}
mutex_unlock(&dev->struct_mutex);
@@ -721,6 +727,10 @@ static void retire_worker(struct kthread_work *work)
struct msm_gpu *gpu = container_of(work, struct msm_gpu, retire_work);
retire_submits(gpu);
+
+ if (!msm_gpu_active(gpu)) {
+ del_timer(&gpu->hangcheck_timer);
+ }
}
/* call from irq handler to schedule work to retire bo's */
--
2.31.1
