drm/sched: Rename drm_sched_free_job_queue to be more descriptive
The current name makes it sound like helper will free a queue, while what it does is it enqueues the free job worker. Rename it to drm_sched_run_free_queue to align with existing drm_sched_run_job_queue. Despite that creating an illusion there are two queues, while in reality there is only one, at least it creates a consistent naming for the two enqueuing helpers. At the same time simplify the "if done" helper by dropping the suffix and adding a double underscore prefix to the one which just enqueues. 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-4-tvrtko.ursulin@linux.intel.com Reviewed-by: Luben Tuikov <ltuikov89@gmail.com> Signed-off-by: Luben Tuikov <ltuikov89@gmail.com>
This commit is contained in:
parent
e608d9f7ac
commit
67dd1d8c9f
@ -266,20 +266,20 @@ static void drm_sched_run_job_queue(struct drm_gpu_scheduler *sched)
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_sched_free_job_queue - enqueue free-job work
|
||||
* __drm_sched_run_free_queue - enqueue free-job work
|
||||
* @sched: scheduler instance
|
||||
*/
|
||||
static void drm_sched_free_job_queue(struct drm_gpu_scheduler *sched)
|
||||
static void __drm_sched_run_free_queue(struct drm_gpu_scheduler *sched)
|
||||
{
|
||||
if (!READ_ONCE(sched->pause_submit))
|
||||
queue_work(sched->submit_wq, &sched->work_free_job);
|
||||
}
|
||||
|
||||
/**
|
||||
* drm_sched_free_job_queue_if_done - enqueue free-job work if ready
|
||||
* drm_sched_run_free_queue - enqueue free-job work if ready
|
||||
* @sched: scheduler instance
|
||||
*/
|
||||
static void drm_sched_free_job_queue_if_done(struct drm_gpu_scheduler *sched)
|
||||
static void drm_sched_run_free_queue(struct drm_gpu_scheduler *sched)
|
||||
{
|
||||
struct drm_sched_job *job;
|
||||
|
||||
@ -287,7 +287,7 @@ static void drm_sched_free_job_queue_if_done(struct drm_gpu_scheduler *sched)
|
||||
job = list_first_entry_or_null(&sched->pending_list,
|
||||
struct drm_sched_job, list);
|
||||
if (job && dma_fence_is_signaled(&job->s_fence->finished))
|
||||
drm_sched_free_job_queue(sched);
|
||||
__drm_sched_run_free_queue(sched);
|
||||
spin_unlock(&sched->job_list_lock);
|
||||
}
|
||||
|
||||
@ -310,7 +310,7 @@ static void drm_sched_job_done(struct drm_sched_job *s_job, int result)
|
||||
dma_fence_get(&s_fence->finished);
|
||||
drm_sched_fence_finished(s_fence, result);
|
||||
dma_fence_put(&s_fence->finished);
|
||||
drm_sched_free_job_queue(sched);
|
||||
__drm_sched_run_free_queue(sched);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1068,7 +1068,7 @@ static void drm_sched_free_job_work(struct work_struct *w)
|
||||
if (job)
|
||||
sched->ops->free_job(job);
|
||||
|
||||
drm_sched_free_job_queue_if_done(sched);
|
||||
drm_sched_run_free_queue(sched);
|
||||
drm_sched_run_job_queue_if_ready(sched);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user