dma-buf/dma_fence_array: remove unused functionality v4

Amdgpu was the only user of the signal on any feature and we dropped
that use case recently, so we can remove that functionality.

v2: update num_pending only after the fence is signaled
v3: separate out simplifying dma_fence_array implementation
v4: fix XE patch split fallout

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Link: https://lore.kernel.org/r/20260422103012.1647-1-christian.koenig@amd.com

diff --git a/drivers/dma-buf/dma-fence-array.c b/drivers/dma-buf/dma-fence-array.c
index 089f6946952486b1823286206168a97b6990bf8f..5e10e8df372f131596ee5108ea33129a09bf2b35 100644 (file)
--- a/drivers/dma-buf/dma-fence-array.c
+++ b/drivers/dma-buf/dma-fence-array.c
@@ -190,15 +190,13 @@ EXPORT_SYMBOL(dma_fence_array_alloc);
  * @fences:            [in]    array containing the fences
  * @context:           [in]    fence context to use
  * @seqno:             [in]    sequence number to use
- * @signal_on_any:     [in]    signal on any fence in the array
  *
  * Implementation of @dma_fence_array_create without allocation. Useful to init
  * a preallocated dma fence array in the path of reclaim or dma fence signaling.
  */
 void dma_fence_array_init(struct dma_fence_array *array,
                          int num_fences, struct dma_fence **fences,
-                         u64 context, unsigned seqno,
-                         bool signal_on_any)
+                         u64 context, unsigned seqno)
 {
        static struct lock_class_key dma_fence_array_lock_key;
 
@@ -222,7 +220,7 @@ void dma_fence_array_init(struct dma_fence_array *array,
         */
        lockdep_set_class(&array->base.inline_lock, &dma_fence_array_lock_key);
 
-       atomic_set(&array->num_pending, signal_on_any ? 1 : num_fences);
+       atomic_set(&array->num_pending, num_fences);
        array->fences = fences;
 
        array->base.error = PENDING_ERROR;
@@ -249,7 +247,6 @@ EXPORT_SYMBOL(dma_fence_array_init);
  * @fences:            [in]    array containing the fences
  * @context:           [in]    fence context to use
  * @seqno:             [in]    sequence number to use
- * @signal_on_any:     [in]    signal on any fence in the array
  *
  * Allocate a dma_fence_array object and initialize the base fence with
  * dma_fence_init().
@@ -264,8 +261,7 @@ EXPORT_SYMBOL(dma_fence_array_init);
  */
 struct dma_fence_array *dma_fence_array_create(int num_fences,
                                               struct dma_fence **fences,
-                                              u64 context, unsigned seqno,
-                                              bool signal_on_any)
+                                              u64 context, unsigned seqno)
 {
        struct dma_fence_array *array;
 
@@ -273,8 +269,7 @@ struct dma_fence_array *dma_fence_array_create(int num_fences,
        if (!array)
                return NULL;
 
-       dma_fence_array_init(array, num_fences, fences,
-                            context, seqno, signal_on_any);
+       dma_fence_array_init(array, num_fences, fences, context, seqno);
 
        return array;
 }

diff --git a/drivers/dma-buf/dma-fence-unwrap.c b/drivers/dma-buf/dma-fence-unwrap.c
index 07fe9bf45aea702280f5353f79fa29b5aacff6e6..53bb40e70b2778a34245409e84fb6a865de1bb6b 100644 (file)
--- a/drivers/dma-buf/dma-fence-unwrap.c
+++ b/drivers/dma-buf/dma-fence-unwrap.c
@@ -180,8 +180,7 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences,
 
        if (count > 1) {
                result = dma_fence_array_create(count, array,
-                                               dma_fence_context_alloc(1),
-                                               1, false);
+                                               dma_fence_context_alloc(1), 1);
                if (!result) {
                        for (i = 0; i < count; i++)
                                dma_fence_put(array[i]);

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index ce9e6c04897ffbc6afd72eb2856e4c94e52f3880..39a92d9f2413683edaf9db10eef42dc0f2387bd0 100644 (file)
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -648,8 +648,7 @@ int dma_resv_get_singleton(struct dma_resv *obj, enum dma_resv_usage usage,
        }
 
        array = dma_fence_array_create(count, fences,
-                                      dma_fence_context_alloc(1),
-                                      1, false);
+                                      dma_fence_context_alloc(1), 1);
        if (!array) {
                while (count--)
                        dma_fence_put(fences[count]);

diff --git a/drivers/dma-buf/st-dma-fence-unwrap.c b/drivers/dma-buf/st-dma-fence-unwrap.c
index 51c87869b7b82c7b1861e5f52cc917e21d70e3ff..4e7ee25372ba6f3d13469d064af595f409e35a27 100644 (file)
--- a/drivers/dma-buf/st-dma-fence-unwrap.c
+++ b/drivers/dma-buf/st-dma-fence-unwrap.c
@@ -64,7 +64,7 @@ static struct dma_fence *mock_array(unsigned int num_fences, ...)
 
        array = dma_fence_array_create(num_fences, fences,
                                       dma_fence_context_alloc(1),
-                                      1, false);
+                                      1);
        if (!array)
                goto error_free;
        return &array->base;

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
index 65ce54b20ec299c02e1daa995b11f5f6ddaa8825..05997e8bbb29ac0d677746d3a63d6bf9733f51b3 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
@@ -3205,8 +3205,7 @@ eb_composite_fence_create(struct i915_execbuffer *eb, int out_fence_fd)
        fence_array = dma_fence_array_create(eb->num_batches,
                                             fences,
                                             eb->context->parallel.fence_context,
-                                            eb->context->parallel.seqno++,
-                                            false);
+                                            eb->context->parallel.seqno++);
        if (!fence_array) {
                kfree(fences);
                return ERR_PTR(-ENOMEM);

diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c
index 24d6d9af20d6fc86598fe6d4f0fb8362882fe6b0..37866768d64c23b7eec60159b4c10c044348d95f 100644 (file)
--- a/drivers/gpu/drm/xe/xe_sync.c
+++ b/drivers/gpu/drm/xe/xe_sync.c
@@ -376,7 +376,7 @@ xe_sync_in_fence_get(struct xe_sync_entry *sync, int num_sync,
                xe_assert(vm->xe, current_fence == num_fence);
                cf = dma_fence_array_create(num_fence, fences,
                                            dma_fence_context_alloc(1),
-                                           1, false);
+                                           1);
                if (!cf)
                        goto err_out;
 

diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c
index 56e2db50bb36a649f3ad7c4d1ece03857f0ca9a5..62a87a051be7da3ae06186573a9f156fb5d77640 100644 (file)
--- a/drivers/gpu/drm/xe/xe_vm.c
+++ b/drivers/gpu/drm/xe/xe_vm.c
@@ -3414,7 +3414,7 @@ collect_fences:
 
        xe_assert(vm->xe, current_fence == n_fence);
        dma_fence_array_init(cf, n_fence, fences, dma_fence_context_alloc(1),
-                            1, false);
+                            1);
        fence = &cf->base;
 
        for_each_tile(tile, vm->xe, id) {

diff --git a/include/linux/dma-fence-array.h b/include/linux/dma-fence-array.h
index 370b3d2bba371755a89b17ffed1ba4dabc1cfa39..1b1d87579c382d21127bc7fc7db9bb280f764ae3 100644 (file)
--- a/include/linux/dma-fence-array.h
+++ b/include/linux/dma-fence-array.h
@@ -81,13 +81,11 @@ to_dma_fence_array(struct dma_fence *fence)
 struct dma_fence_array *dma_fence_array_alloc(int num_fences);
 void dma_fence_array_init(struct dma_fence_array *array,
                          int num_fences, struct dma_fence **fences,
-                         u64 context, unsigned seqno,
-                         bool signal_on_any);
+                         u64 context, unsigned seqno);
 
 struct dma_fence_array *dma_fence_array_create(int num_fences,
                                               struct dma_fence **fences,
-                                              u64 context, unsigned seqno,
-                                              bool signal_on_any);
+                                              u64 context, unsigned seqno);
 
 bool dma_fence_match_context(struct dma_fence *fence, u64 context);