71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
From 3c6c7ca4508b6cb1a033ac954c50a1b2c97af883 Mon Sep 17 00:00:00 2001
|
|
From: Matthew Brost <matthew.brost@intel.com>
|
|
Date: Mon, 30 Oct 2023 20:24:39 -0700
|
|
Subject: [PATCH] drm/sched: Add a helper to queue TDR immediately
|
|
|
|
Add a helper whereby a driver can invoke TDR immediately.
|
|
|
|
v2:
|
|
- Drop timeout args, rename function, use mod delayed work (Luben)
|
|
v3:
|
|
- s/XE/Xe (Luben)
|
|
- present tense in commit message (Luben)
|
|
- Adjust comment for drm_sched_tdr_queue_imm (Luben)
|
|
v4:
|
|
- Adjust commit message (Luben)
|
|
|
|
Cc: Luben Tuikov <luben.tuikov@amd.com>
|
|
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
|
|
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
|
|
Link: https://lore.kernel.org/r/20231031032439.1558703-6-matthew.brost@intel.com
|
|
Signed-off-by: Luben Tuikov <ltuikov89@gmail.com>
|
|
---
|
|
drivers/gpu/drm/scheduler/sched_main.c | 18 +++++++++++++++++-
|
|
include/drm/gpu_scheduler.h | 1 +
|
|
2 files changed, 18 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/scheduler/sched_main.c
|
|
+++ b/drivers/gpu/drm/scheduler/sched_main.c
|
|
@@ -336,7 +336,7 @@ static void drm_sched_start_timeout(stru
|
|
{
|
|
if (sched->timeout != MAX_SCHEDULE_TIMEOUT &&
|
|
!list_empty(&sched->pending_list))
|
|
- queue_delayed_work(sched->timeout_wq, &sched->work_tdr, sched->timeout);
|
|
+ mod_delayed_work(sched->timeout_wq, &sched->work_tdr, sched->timeout);
|
|
}
|
|
|
|
/**
|
|
@@ -354,6 +354,22 @@ void drm_sched_fault(struct drm_gpu_sche
|
|
EXPORT_SYMBOL(drm_sched_fault);
|
|
|
|
/**
|
|
+ * drm_sched_tdr_queue_imm: - immediately start job timeout handler
|
|
+ *
|
|
+ * @sched: scheduler for which the timeout handling should be started.
|
|
+ *
|
|
+ * Start timeout handling immediately for the named scheduler.
|
|
+ */
|
|
+void drm_sched_tdr_queue_imm(struct drm_gpu_scheduler *sched)
|
|
+{
|
|
+ spin_lock(&sched->job_list_lock);
|
|
+ sched->timeout = 0;
|
|
+ drm_sched_start_timeout(sched);
|
|
+ spin_unlock(&sched->job_list_lock);
|
|
+}
|
|
+EXPORT_SYMBOL(drm_sched_tdr_queue_imm);
|
|
+
|
|
+/**
|
|
* drm_sched_suspend_timeout - Suspend scheduler job timeout
|
|
*
|
|
* @sched: scheduler instance for which to suspend the timeout
|
|
--- a/include/drm/gpu_scheduler.h
|
|
+++ b/include/drm/gpu_scheduler.h
|
|
@@ -556,6 +556,7 @@ void drm_sched_entity_modify_sched(struc
|
|
struct drm_gpu_scheduler **sched_list,
|
|
unsigned int num_sched_list);
|
|
|
|
+void drm_sched_tdr_queue_imm(struct drm_gpu_scheduler *sched);
|
|
void drm_sched_job_cleanup(struct drm_sched_job *job);
|
|
void drm_sched_wakeup_if_can_queue(struct drm_gpu_scheduler *sched);
|
|
bool drm_sched_wqueue_ready(struct drm_gpu_scheduler *sched);
|