[Intel-xe] [PATCH 04/20] Revert "drm/sched: Add helper to set TDR timeout"

Rodrigo Vivi rodrigo.vivi at intel.com
Thu Nov 9 14:53:22 UTC 2023


This reverts commit fcaa05c341776711572a1473678e5814d5c46bed.

Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 drivers/gpu/drm/scheduler/sched_main.c | 18 ------------------
 include/drm/gpu_scheduler.h            |  1 -
 2 files changed, 19 deletions(-)

diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c
index 856366d326e8..3056e0462619 100644
--- a/drivers/gpu/drm/scheduler/sched_main.c
+++ b/drivers/gpu/drm/scheduler/sched_main.c
@@ -350,24 +350,6 @@ static void drm_sched_start_timeout(struct drm_gpu_scheduler *sched)
 		queue_delayed_work(sched->timeout_wq, &sched->work_tdr, sched->timeout);
 }
 
-/**
- * drm_sched_set_timeout - set timeout for reset worker
- *
- * @sched: scheduler instance to set and (re)-start the worker for
- * @timeout: timeout period
- *
- * Set and (re)-start the timeout for the given scheduler.
- */
-void drm_sched_set_timeout(struct drm_gpu_scheduler *sched, long timeout)
-{
-	spin_lock(&sched->job_list_lock);
-	sched->timeout = timeout;
-	cancel_delayed_work(&sched->work_tdr);
-	drm_sched_start_timeout(sched);
-	spin_unlock(&sched->job_list_lock);
-}
-EXPORT_SYMBOL(drm_sched_set_timeout);
-
 /**
  * drm_sched_fault - immediately start timeout handler
  *
diff --git a/include/drm/gpu_scheduler.h b/include/drm/gpu_scheduler.h
index 5de4ec663791..bb3470e0b16a 100644
--- a/include/drm/gpu_scheduler.h
+++ b/include/drm/gpu_scheduler.h
@@ -575,7 +575,6 @@ void drm_sched_entity_modify_sched(struct drm_sched_entity *entity,
 				    struct drm_gpu_scheduler **sched_list,
                                    unsigned int num_sched_list);
 
-void drm_sched_set_timeout(struct drm_gpu_scheduler *sched, long timeout);
 void drm_sched_job_cleanup(struct drm_sched_job *job);
 void drm_sched_wakeup_if_can_queue(struct drm_gpu_scheduler *sched);
 void drm_sched_add_msg(struct drm_gpu_scheduler *sched,
-- 
2.41.0



More information about the Intel-xe mailing list