On 4/24/25 15:02, Philipp Stanner wrote:
nouveau_fence_done() contains an if branch that checks whether a nouveau_fence has either of the two existing nouveau_fence backend ops, which will always evaluate to true.
Remove the surplus check.
Signed-off-by: Philipp Stanner phasta@kernel.org
Reviewed-by: Christian König christian.koenig@amd.com
drivers/gpu/drm/nouveau/nouveau_fence.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 2b79bcb7da16..fb9811938c82 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -249,21 +249,19 @@ nouveau_fence_emit(struct nouveau_fence *fence) bool nouveau_fence_done(struct nouveau_fence *fence) {
- if (fence->base.ops == &nouveau_fence_ops_legacy ||
fence->base.ops == &nouveau_fence_ops_uevent) {struct nouveau_fence_chan *fctx = nouveau_fctx(fence);struct nouveau_channel *chan;unsigned long flags;
- struct nouveau_fence_chan *fctx = nouveau_fctx(fence);
- struct nouveau_channel *chan;
- unsigned long flags;
if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))return true;
- if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->base.flags))
return true;- spin_lock_irqsave(&fctx->lock, flags);
- chan = rcu_dereference_protected(fence->channel, lockdep_is_held(&fctx->lock));
- if (chan)
nouveau_fence_update(chan, fctx);- spin_unlock_irqrestore(&fctx->lock, flags);
spin_lock_irqsave(&fctx->lock, flags);chan = rcu_dereference_protected(fence->channel, lockdep_is_held(&fctx->lock));if (chan)nouveau_fence_update(chan, fctx);spin_unlock_irqrestore(&fctx->lock, flags);- } return dma_fence_is_signaled(&fence->base);
}