]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/v3d: Ensure job pointer is set to NULL after job completion
authorMaíra Canal <mcanal@igalia.com>
Mon, 13 Jan 2025 15:47:40 +0000 (12:47 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 1 Feb 2025 17:22:27 +0000 (18:22 +0100)
[ Upstream commit e4b5ccd392b92300a2b341705cc4805681094e49 ]

After a job completes, the corresponding pointer in the device must
be set to NULL. Failing to do so triggers a warning when unloading
the driver, as it appears the job is still active. To prevent this,
assign the job pointer to NULL after completing the job, indicating
the job has finished.

Fixes: 14d1d1908696 ("drm/v3d: Remove the bad signaled() implementation.")
Signed-off-by: Maíra Canal <mcanal@igalia.com>
Reviewed-by: Jose Maria Casanova Crespo <jmcasanova@igalia.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250113154741.67520-1-mcanal@igalia.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/v3d/v3d_irq.c

index c88686489b88899fb3b8d8094bec02ff32b662f5..22aa02d75c5cc136709443f3eb51e8420566b6da 100644 (file)
@@ -103,6 +103,7 @@ v3d_irq(int irq, void *arg)
 
                trace_v3d_bcl_irq(&v3d->drm, fence->seqno);
                dma_fence_signal(&fence->base);
+               v3d->bin_job = NULL;
                status = IRQ_HANDLED;
        }
 
@@ -112,6 +113,7 @@ v3d_irq(int irq, void *arg)
 
                trace_v3d_rcl_irq(&v3d->drm, fence->seqno);
                dma_fence_signal(&fence->base);
+               v3d->render_job = NULL;
                status = IRQ_HANDLED;
        }
 
@@ -121,6 +123,7 @@ v3d_irq(int irq, void *arg)
 
                trace_v3d_csd_irq(&v3d->drm, fence->seqno);
                dma_fence_signal(&fence->base);
+               v3d->csd_job = NULL;
                status = IRQ_HANDLED;
        }
 
@@ -157,6 +160,7 @@ v3d_hub_irq(int irq, void *arg)
 
                trace_v3d_tfu_irq(&v3d->drm, fence->seqno);
                dma_fence_signal(&fence->base);
+               v3d->tfu_job = NULL;
                status = IRQ_HANDLED;
        }