Skip to contentSkip to conversation

dma-buf/dma-fence: Remove dma_fence_later()

PATCH New Philipp Stanner 1 participant 1 message Nov 20

Subsystems (2)
lore
Share & tools
lore

Philipp Stanner

author maintainer
#0 lore raw

PATCH v2 1/1 dma-buf/dma-fence: Remove dma_fence_later()

dma_fence_later() does not have any in-tree users anymore. dma_fence_is_later() is available as an alternative.

Remove the surplus function.

---
Changes in v2:
- Rebase onto misc-next due to conflict.
- Add Christian's Rb.

---
 drivers/dma-buf/dma-fence.c |  3 ---
 include/linux/dma-fence.h   | 26 --------------------------
 2 files changed, 29 deletions(-)
drivers/dma-buf/dma-fence.c +0 -3
index 0776ca7c795e..ab02afdb0f18 100644
@@ -1115,9 +1115,6 @@ static bool dma_fence_flags_valid(unsigned long flags)
  * refcount after committing with this fence, but it will need to hold a
  * refcount again if &dma_fence_ops.enable_signaling gets called.
  *
- * context and seqno are used for easy comparison between fences, allowing
- * to check which fence is later by simply using dma_fence_later().
- *
  * External locks are a relic of legacy use cases that needed a shared lock
  * to serialize signaling when no out-of-order signaling was possible through
  * &dma_fence_ops.signaled. Drivers have abandoned this concept since the
include/linux/dma-fence.h +0 -26
index 56c4e5beaafe..513d9dbbff47 100644
@@ -626,32 +626,6 @@ static inline bool dma_fence_is_later_or_same(struct dma_fence *f1,
 	return f1 == f2 || dma_fence_is_later(f1, f2);
 }
 
-/**
- * dma_fence_later - return the chronologically later fence
- * @f1:	the first fence from the same context
- * @f2:	the second fence from the same context
- *
- * Returns NULL if both fences are signaled, otherwise the fence that would be
- * signaled last. Both fences must be from the same context, since a seqno is
- * not re-used across contexts.
- */
-static inline struct dma_fence *dma_fence_later(struct dma_fence *f1,
-						struct dma_fence *f2)
-{
-	if (WARN_ON(f1->context != f2->context))
-		return NULL;
-
-	/*
-	 * Can't check just DMA_FENCE_FLAG_SIGNALED_BIT here, it may never
-	 * have been set if enable_signaling wasn't called, and enabling that
-	 * here is overkill.
-	 */
-	if (dma_fence_is_later(f1, f2))
-		return dma_fence_is_signaled(f1) ? NULL : f1;
-	else
-		return dma_fence_is_signaled(f2) ? NULL : f2;
-}
-
 /**
  * dma_fence_get_status_locked - returns the status upon completion
  * @fence: the dma_fence to query
Signature · 1 line
2.56.0