summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMaxime Ripard <mripard@kernel.org>2025-06-03 15:07:39 +0200
committerMaxime Ripard <mripard@kernel.org>2025-06-03 15:07:39 +0200
commit7b1166dee847d5018c1f3cc781218e806078f752 (patch)
tree84a2e30eade0212b89cc05063fb8e9a5793e9d7a /include/linux
parentb6cbfa872045d7ed307c55aa1cdb0d5125d84282 (diff)
parentf8bb3ed3197966fb60bedcbdc126d2bd5bc0a77f (diff)
Merge drm-next-2025-05-28 into drm-misc-next
Christian needs a recent drm-next branch to merge fence patches. Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dma-fence-unwrap.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma-fence-unwrap.h b/include/linux/dma-fence-unwrap.h
index 66b1e56fbb81..62df222fe0f1 100644
--- a/include/linux/dma-fence-unwrap.h
+++ b/include/linux/dma-fence-unwrap.h
@@ -52,6 +52,8 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences,
struct dma_fence **fences,
struct dma_fence_unwrap *cursors);
+int dma_fence_dedup_array(struct dma_fence **array, int num_fences);
+
/**
* dma_fence_unwrap_merge - unwrap and merge fences
*