[PATCH 2/4] drm/nouveau: Simplify calls to nvif_event_block()

[Philipp Stanner]

nouveau_fence_signal() returns a de-facto boolean to indicate when
nvif_event_block() shall be called.

The code can be made more compact and readable by calling
nvif_event_block() in nouveau_fence_update() directly.

Make those calls in nouveau_fence.c more canonical.

Signed-off-by: Philipp Stanner <pha...@kernel.org>
---
 drivers/gpu/drm/nouveau/nouveau_fence.c | 31 +++++++++++--------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c 
b/drivers/gpu/drm/nouveau/nouveau_fence.c
index 761c174cb286..2b79bcb7da16 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -50,10 +50,10 @@ nouveau_fctx(struct nouveau_fence *fence)
        return container_of(fence->base.lock, struct nouveau_fence_chan, lock);
 }
 
-static int
+static bool
 nouveau_fence_signal(struct nouveau_fence *fence)
 {
-       int drop = 0;
+       bool drop = false;
 
        dma_fence_signal_locked(&fence->base);
        list_del(&fence->head);
@@ -63,7 +63,7 @@ nouveau_fence_signal(struct nouveau_fence *fence)
                struct nouveau_fence_chan *fctx = nouveau_fctx(fence);
 
                if (!--fctx->notify_ref)
-                       drop = 1;
+                       drop = true;
        }
 
        dma_fence_put(&fence->base);
@@ -125,21 +125,23 @@ nouveau_fence_context_free(struct nouveau_fence_chan 
*fctx)
        kref_put(&fctx->fence_ref, nouveau_fence_context_put);
 }
 
-static int
+static void
 nouveau_fence_update(struct nouveau_channel *chan, struct nouveau_fence_chan 
*fctx)
 {
        struct nouveau_fence *fence, *tmp;
-       int drop = 0;
+       bool drop = false;
        u32 seq = fctx->read(chan);
 
        list_for_each_entry_safe(fence, tmp, &fctx->pending, head) {
                if ((int)(seq - fence->base.seqno) < 0)
                        break;
 
-               drop |= nouveau_fence_signal(fence);
+               if (nouveau_fence_signal(fence))
+                       drop = true;
        }
 
-       return drop;
+       if (drop)
+               nvif_event_block(&fctx->event);
 }
 
 static void
@@ -150,18 +152,13 @@ nouveau_fence_uevent_work(struct work_struct *work)
        struct nouveau_channel *chan;
        struct nouveau_fence *fence;
        unsigned long flags;
-       int drop = 0;
 
        spin_lock_irqsave(&fctx->lock, flags);
        fence = list_first_entry_or_null(&fctx->pending, typeof(*fence), head);
        if (fence) {
                chan = rcu_dereference_protected(fence->channel, 
lockdep_is_held(&fctx->lock));
-               if (nouveau_fence_update(chan, fctx))
-                       drop = 1;
+               nouveau_fence_update(chan, fctx);
        }
-       if (drop)
-               nvif_event_block(&fctx->event);
-
        spin_unlock_irqrestore(&fctx->lock, flags);
 }
 
@@ -241,9 +238,7 @@ nouveau_fence_emit(struct nouveau_fence *fence)
                        return -ENODEV;
                }
 
-               if (nouveau_fence_update(chan, fctx))
-                       nvif_event_block(&fctx->event);
-
+               nouveau_fence_update(chan, fctx);
                list_add_tail(&fence->head, &fctx->pending);
                spin_unlock_irq(&fctx->lock);
        }
@@ -265,8 +260,8 @@ nouveau_fence_done(struct nouveau_fence *fence)
 
                spin_lock_irqsave(&fctx->lock, flags);
                chan = rcu_dereference_protected(fence->channel, 
lockdep_is_held(&fctx->lock));
-               if (chan && nouveau_fence_update(chan, fctx))
-                       nvif_event_block(&fctx->event);
+               if (chan)
+                       nouveau_fence_update(chan, fctx);
                spin_unlock_irqrestore(&fctx->lock, flags);
        }
        return dma_fence_is_signaled(&fence->base);
-- 
2.48.1