]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
dma-fence: use correct callback in dma_fence_timeline_name()
authorAndré Draszik <andre.draszik@linaro.org>
Thu, 18 Jun 2026 12:00:39 +0000 (13:00 +0100)
committerTvrtko Ursulin <tursulin@ursulin.net>
Mon, 29 Jun 2026 08:10:02 +0000 (09:10 +0100)
dma_fence_timeline_name() is a wrapper around
dma_fence_ops::get_timeline_name(). Since the blamed commit below, it
calls an incorrect callback.

Update it to restore functionality by calling the intended callback.

Fixes: 62918542b7bf ("dma-fence: Fix sparse warnings due __rcu annotations")
Cc: <stable@vger.kernel.org> # v7.1+
[tursulin: added cc stable]
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Reviewed-by: Philipp Stanner <phasta@kernel.org>
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
Link: https://lore.kernel.org/r/20260618-linux-drm_crtc_fix-v1-1-801f29c9853d@linaro.org
drivers/dma-buf/dma-fence.c

index a2aa82f4eedd498cb62442d33fac447f18ddf12a..7120610f4850f7467e0af8eff02adbd0df6b4a8e 100644 (file)
@@ -1201,7 +1201,7 @@ const char __rcu *dma_fence_timeline_name(struct dma_fence *fence)
        /* RCU protection is required for safe access to returned string */
        ops = rcu_dereference(fence->ops);
        if (!dma_fence_test_signaled_flag(fence))
-               return (const char __rcu *)ops->get_driver_name(fence);
+               return (const char __rcu *)ops->get_timeline_name(fence);
        else
                return (const char __rcu *)"signaled-timeline";
 }