[Intel-gfx] [PATCH 5/4] dma-fence: Have dma_fence_signal call signal_locked

[Chris Wilson]

Now that dma_fence_signal always takes the spinlock to flush the
cb_list, simply take the spinlock and call dma_fence_signal_locked() to
avoid code repetition.

Suggested-by: Christian König <christian.koenig at amd.com>
Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Christian König <christian.koenig at amd.com>
---
 drivers/dma-buf/dma-fence.c | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index ab4a456bba04..367b71084d34 100644
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -122,26 +122,18 @@ EXPORT_SYMBOL(dma_fence_context_alloc);
  */
 int dma_fence_signal_locked(struct dma_fence *fence)
 {
-	int ret = 0;
-
-	lockdep_assert_held(fence->lock);
-
 	if (WARN_ON(!fence))
 		return -EINVAL;
 
-	if (!__dma_fence_signal(fence)) {
-		ret = -EINVAL;
+	lockdep_assert_held(fence->lock);
 
-		/*
-		 * we might have raced with the unlocked dma_fence_signal,
-		 * still run through all callbacks
-		 */
-	} else {
-		__dma_fence_signal__timestamp(fence, ktime_get());
-	}
+	if (!__dma_fence_signal(fence))
+		return -EINVAL;
 
+	__dma_fence_signal__timestamp(fence, ktime_get());
 	__dma_fence_signal__notify(fence);
-	return ret;
+
+	return 0;
 }
 EXPORT_SYMBOL(dma_fence_signal_locked);
 
@@ -161,19 +153,19 @@ EXPORT_SYMBOL(dma_fence_signal_locked);
 int dma_fence_signal(struct dma_fence *fence)
 {
 	unsigned long flags;
+	int ret;
 
 	if (!fence)
 		return -EINVAL;
 
-	if (!__dma_fence_signal(fence))
-		return -EINVAL;
-
-	__dma_fence_signal__timestamp(fence, ktime_get());
+	if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags))
+		return 0;
 
 	spin_lock_irqsave(fence->lock, flags);
-	__dma_fence_signal__notify(fence);
+	ret = dma_fence_signal_locked(fence);
 	spin_unlock_irqrestore(fence->lock, flags);
-	return 0;
+
+	return ret;
 }
 EXPORT_SYMBOL(dma_fence_signal);
 
-- 
2.23.0.rc1