Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/v3d: Rename the fence signaled from IRQs to "irq_fence".

We have another thing called the "done fence" that tracks when the
scheduler considers the job done, and having the shared name was
confusing.

Signed-off-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20190313235211.28995-2-eric@anholt.net
Reviewed-by: Dave Emett <david.emett@broadcom.com>

+14 -14
+2 -2
drivers/gpu/drm/v3d/v3d_drv.h
··· 163 163 struct dma_fence *in_fence; 164 164 165 165 /* v3d fence to be signaled by IRQ handler when the job is complete. */ 166 - struct dma_fence *done_fence; 166 + struct dma_fence *irq_fence; 167 167 168 168 /* GPU virtual addresses of the start/end of the CL job. */ 169 169 u32 start, end; ··· 210 210 struct dma_fence *in_fence; 211 211 212 212 /* v3d fence to be signaled by IRQ handler when the job is complete. */ 213 - struct dma_fence *done_fence; 213 + struct dma_fence *irq_fence; 214 214 215 215 struct v3d_dev *v3d; 216 216
+3 -3
drivers/gpu/drm/v3d/v3d_gem.c
··· 340 340 dma_fence_put(exec->bin.in_fence); 341 341 dma_fence_put(exec->render.in_fence); 342 342 343 - dma_fence_put(exec->bin.done_fence); 344 - dma_fence_put(exec->render.done_fence); 343 + dma_fence_put(exec->bin.irq_fence); 344 + dma_fence_put(exec->render.irq_fence); 345 345 346 346 dma_fence_put(exec->bin_done_fence); 347 347 dma_fence_put(exec->render_done_fence); ··· 374 374 unsigned int i; 375 375 376 376 dma_fence_put(job->in_fence); 377 - dma_fence_put(job->done_fence); 377 + dma_fence_put(job->irq_fence); 378 378 379 379 for (i = 0; i < ARRAY_SIZE(job->bo); i++) { 380 380 if (job->bo[i])
+3 -3
drivers/gpu/drm/v3d/v3d_irq.c
··· 96 96 97 97 if (intsts & V3D_INT_FLDONE) { 98 98 struct v3d_fence *fence = 99 - to_v3d_fence(v3d->bin_job->bin.done_fence); 99 + to_v3d_fence(v3d->bin_job->bin.irq_fence); 100 100 101 101 trace_v3d_bcl_irq(&v3d->drm, fence->seqno); 102 102 dma_fence_signal(&fence->base); ··· 105 105 106 106 if (intsts & V3D_INT_FRDONE) { 107 107 struct v3d_fence *fence = 108 - to_v3d_fence(v3d->render_job->render.done_fence); 108 + to_v3d_fence(v3d->render_job->render.irq_fence); 109 109 110 110 trace_v3d_rcl_irq(&v3d->drm, fence->seqno); 111 111 dma_fence_signal(&fence->base); ··· 141 141 142 142 if (intsts & V3D_HUB_INT_TFUC) { 143 143 struct v3d_fence *fence = 144 - to_v3d_fence(v3d->tfu_job->done_fence); 144 + to_v3d_fence(v3d->tfu_job->irq_fence); 145 145 146 146 trace_v3d_tfu_irq(&v3d->drm, fence->seqno); 147 147 dma_fence_signal(&fence->base);
+6 -6
drivers/gpu/drm/v3d/v3d_sched.c
··· 156 156 if (IS_ERR(fence)) 157 157 return NULL; 158 158 159 - if (job->done_fence) 160 - dma_fence_put(job->done_fence); 161 - job->done_fence = dma_fence_get(fence); 159 + if (job->irq_fence) 160 + dma_fence_put(job->irq_fence); 161 + job->irq_fence = dma_fence_get(fence); 162 162 163 163 trace_v3d_submit_cl(dev, q == V3D_RENDER, to_v3d_fence(fence)->seqno, 164 164 job->start, job->end); ··· 199 199 return NULL; 200 200 201 201 v3d->tfu_job = job; 202 - if (job->done_fence) 203 - dma_fence_put(job->done_fence); 204 - job->done_fence = dma_fence_get(fence); 202 + if (job->irq_fence) 203 + dma_fence_put(job->irq_fence); 204 + job->irq_fence = dma_fence_get(fence); 205 205 206 206 trace_v3d_submit_tfu(dev, to_v3d_fence(fence)->seqno); 207 207