mirror of
https://github.com/torvalds/linux.git
synced 2026-06-03 20:14:06 +02:00
drm/v3d: Synchronous operations can't timeout
CPU jobs and CACHE CLEAN jobs execute synchronously once the DRM scheduler starts running them. Therefore, there is no fence to wait on, neither are those jobs able to timeout. Hence, remove the `timedout_job` hook from the CPU and CACHE CLEAN scheduler ops. Reviewed-by: Iago Toral Quiroga <itoral@igalia.com> Reviewed-by: Melissa Wen <mwen@igalia.com> Link: https://lore.kernel.org/r/20250826-v3d-queue-lock-v3-5-979efc43e490@igalia.com Signed-off-by: Maíra Canal <mcanal@igalia.com>
This commit is contained in:
parent
fa6a20c874
commit
78fe02d090
|
|
@ -701,6 +701,7 @@ v3d_cpu_job_run(struct drm_sched_job *sched_job)
|
|||
trace_v3d_cpu_job_end(&v3d->drm, job->job_type);
|
||||
v3d_job_update_stats(&job->base, V3D_CPU);
|
||||
|
||||
/* Synchronous operation, so no fence to wait on. */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -716,6 +717,7 @@ v3d_cache_clean_job_run(struct drm_sched_job *sched_job)
|
|||
|
||||
v3d_job_update_stats(job, V3D_CACHE_CLEAN);
|
||||
|
||||
/* Synchronous operation, so no fence to wait on. */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -797,7 +799,7 @@ v3d_render_job_timedout(struct drm_sched_job *sched_job)
|
|||
}
|
||||
|
||||
static enum drm_gpu_sched_stat
|
||||
v3d_generic_job_timedout(struct drm_sched_job *sched_job)
|
||||
v3d_tfu_job_timedout(struct drm_sched_job *sched_job)
|
||||
{
|
||||
struct v3d_job *job = to_v3d_job(sched_job);
|
||||
|
||||
|
|
@ -837,7 +839,7 @@ static const struct drm_sched_backend_ops v3d_render_sched_ops = {
|
|||
|
||||
static const struct drm_sched_backend_ops v3d_tfu_sched_ops = {
|
||||
.run_job = v3d_tfu_job_run,
|
||||
.timedout_job = v3d_generic_job_timedout,
|
||||
.timedout_job = v3d_tfu_job_timedout,
|
||||
.free_job = v3d_sched_job_free,
|
||||
};
|
||||
|
||||
|
|
@ -849,13 +851,11 @@ static const struct drm_sched_backend_ops v3d_csd_sched_ops = {
|
|||
|
||||
static const struct drm_sched_backend_ops v3d_cache_clean_sched_ops = {
|
||||
.run_job = v3d_cache_clean_job_run,
|
||||
.timedout_job = v3d_generic_job_timedout,
|
||||
.free_job = v3d_sched_job_free
|
||||
};
|
||||
|
||||
static const struct drm_sched_backend_ops v3d_cpu_sched_ops = {
|
||||
.run_job = v3d_cpu_job_run,
|
||||
.timedout_job = v3d_generic_job_timedout,
|
||||
.free_job = v3d_cpu_job_free
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user