Skip to content

Commit 1315642

Browse files
mairacanalpelwell
authored andcommitted
drm/v3d: Set job pointer to NULL when the job's fence has an error
Similar to commit e4b5ccd ("drm/v3d: Ensure job pointer is set to NULL after job completion"), ensure the job pointer is set to `NULL` when a job's fence has an error. Failing to do so can trigger kernel warnings in specific scenarios, such as: 1. v3d_csd_job_run() assigns `v3d->csd_job = job` 2. CSD job exceeds hang limit, causing a timeout → v3d_gpu_reset_for_timeout() 3. GPU reset 4. drm_sched_resubmit_jobs() sets the job's fence to `-ECANCELED`. 5. v3d_csd_job_run() detects the fence error and returns NULL, not submitting the job to the GPU 6. User-space runs `modprobe -r v3d` 7. v3d_gem_destroy() v3d_gem_destroy() triggers a warning indicating that the CSD job never ended, as we didn't set `v3d->csd_job` to NULL after the timeout. The same can also happen to BIN, RENDER, and TFU jobs. Signed-off-by: Maíra Canal <mcanal@igalia.com>
1 parent 5258ca4 commit 1315642

1 file changed

Lines changed: 14 additions & 4 deletions

File tree

drivers/gpu/drm/v3d/v3d_sched.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,12 @@ static struct dma_fence *v3d_bin_job_run(struct drm_sched_job *sched_job)
189189
struct dma_fence *fence;
190190
unsigned long irqflags;
191191

192-
if (unlikely(job->base.base.s_fence->finished.error))
192+
if (unlikely(job->base.base.s_fence->finished.error)) {
193+
spin_lock_irqsave(&v3d->job_lock, irqflags);
194+
v3d->bin_job = NULL;
195+
spin_unlock_irqrestore(&v3d->job_lock, irqflags);
193196
return NULL;
197+
}
194198

195199
/* Lock required around bin_job update vs
196200
* v3d_overflow_mem_work().
@@ -244,8 +248,10 @@ static struct dma_fence *v3d_render_job_run(struct drm_sched_job *sched_job)
244248
struct drm_device *dev = &v3d->drm;
245249
struct dma_fence *fence;
246250

247-
if (unlikely(job->base.base.s_fence->finished.error))
251+
if (unlikely(job->base.base.s_fence->finished.error)) {
252+
v3d->render_job = NULL;
248253
return NULL;
254+
}
249255

250256
v3d->render_job = job;
251257

@@ -292,8 +298,10 @@ v3d_tfu_job_run(struct drm_sched_job *sched_job)
292298
struct drm_device *dev = &v3d->drm;
293299
struct dma_fence *fence;
294300

295-
if (unlikely(job->base.base.s_fence->finished.error))
301+
if (unlikely(job->base.base.s_fence->finished.error)) {
302+
v3d->tfu_job = NULL;
296303
return NULL;
304+
}
297305

298306
v3d->tfu_job = job;
299307

@@ -337,8 +345,10 @@ v3d_csd_job_run(struct drm_sched_job *sched_job)
337345
struct dma_fence *fence;
338346
int i, csd_cfg0_reg, csd_cfg_reg_count;
339347

340-
if (unlikely(job->base.base.s_fence->finished.error))
348+
if (unlikely(job->base.base.s_fence->finished.error)) {
349+
v3d->csd_job = NULL;
341350
return NULL;
351+
}
342352

343353
v3d->csd_job = job;
344354

0 commit comments

Comments
 (0)