71 lines
2.8 KiB
Diff
71 lines
2.8 KiB
Diff
From f12af4c461fb6cd5ed7b48f8b4d09b22eb19fcc5 Mon Sep 17 00:00:00 2001
|
|
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
|
|
Date: Thu, 2 Nov 2023 10:55:38 +0000
|
|
Subject: [PATCH] drm/sched: Drop suffix from drm_sched_wakeup_if_can_queue
|
|
|
|
Because a) helper is exported to other parts of the scheduler and
|
|
b) there isn't a plain drm_sched_wakeup to begin with, I think we can
|
|
drop the suffix and by doing so separate the intimiate knowledge
|
|
between the scheduler components a bit better.
|
|
|
|
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
|
|
Cc: Luben Tuikov <ltuikov89@gmail.com>
|
|
Cc: Matthew Brost <matthew.brost@intel.com>
|
|
Link: https://patchwork.freedesktop.org/patch/msgid/20231102105538.391648-6-tvrtko.ursulin@linux.intel.com
|
|
Reviewed-by: Luben Tuikov <ltuikov89@gmail.com>
|
|
Signed-off-by: Luben Tuikov <ltuikov89@gmail.com>
|
|
---
|
|
drivers/gpu/drm/scheduler/sched_entity.c | 4 ++--
|
|
drivers/gpu/drm/scheduler/sched_main.c | 4 ++--
|
|
include/drm/gpu_scheduler.h | 2 +-
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/scheduler/sched_entity.c
|
|
+++ b/drivers/gpu/drm/scheduler/sched_entity.c
|
|
@@ -370,7 +370,7 @@ static void drm_sched_entity_wakeup(stru
|
|
container_of(cb, struct drm_sched_entity, cb);
|
|
|
|
drm_sched_entity_clear_dep(f, cb);
|
|
- drm_sched_wakeup_if_can_queue(entity->rq->sched);
|
|
+ drm_sched_wakeup(entity->rq->sched);
|
|
}
|
|
|
|
/**
|
|
@@ -602,7 +602,7 @@ void drm_sched_entity_push_job(struct dr
|
|
if (drm_sched_policy == DRM_SCHED_POLICY_FIFO)
|
|
drm_sched_rq_update_fifo(entity, submit_ts);
|
|
|
|
- drm_sched_wakeup_if_can_queue(entity->rq->sched);
|
|
+ drm_sched_wakeup(entity->rq->sched);
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(drm_sched_entity_push_job);
|
|
--- a/drivers/gpu/drm/scheduler/sched_main.c
|
|
+++ b/drivers/gpu/drm/scheduler/sched_main.c
|
|
@@ -917,12 +917,12 @@ static bool drm_sched_can_queue(struct d
|
|
}
|
|
|
|
/**
|
|
- * drm_sched_wakeup_if_can_queue - Wake up the scheduler
|
|
+ * drm_sched_wakeup - Wake up the scheduler if it is ready to queue
|
|
* @sched: scheduler instance
|
|
*
|
|
* Wake up the scheduler if we can queue jobs.
|
|
*/
|
|
-void drm_sched_wakeup_if_can_queue(struct drm_gpu_scheduler *sched)
|
|
+void drm_sched_wakeup(struct drm_gpu_scheduler *sched)
|
|
{
|
|
if (drm_sched_can_queue(sched))
|
|
drm_sched_run_job_queue(sched);
|
|
--- a/include/drm/gpu_scheduler.h
|
|
+++ b/include/drm/gpu_scheduler.h
|
|
@@ -558,7 +558,7 @@ void drm_sched_entity_modify_sched(struc
|
|
|
|
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);
|
|
+void drm_sched_wakeup(struct drm_gpu_scheduler *sched);
|
|
bool drm_sched_wqueue_ready(struct drm_gpu_scheduler *sched);
|
|
void drm_sched_wqueue_stop(struct drm_gpu_scheduler *sched);
|
|
void drm_sched_wqueue_start(struct drm_gpu_scheduler *sched);
|