diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2026-07-08 13:00:55 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2026-07-08 13:00:55 +0200 |
| commit | e7743a6b0334dcaa9eca3a4103f74963664ff563 (patch) | |
| tree | d936ff994cf5f96da054e64872c54e4ccffc0d32 /drivers/dma-buf | |
| parent | cdd12b8d71246a11b885f65a024accd232aca658 (diff) | |
| parent | 0461ba9a7994a9bfa2ceefe730e2c87759edc267 (diff) | |
| download | linux-next-e7743a6b0334dcaa9eca3a4103f74963664ff563.tar.gz linux-next-e7743a6b0334dcaa9eca3a4103f74963664ff563.zip | |
Merge drm/drm-next into drm-misc-next
Backmerging to get updates from v7.2-rc2 into drm-misc-next.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/dma-fence-unwrap.c | 3 | ||||
| -rw-r--r-- | drivers/dma-buf/dma-fence.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/dma-buf/dma-fence-unwrap.c b/drivers/dma-buf/dma-fence-unwrap.c index 65e87d263c3a..120fe0c2a75a 100644 --- a/drivers/dma-buf/dma-fence-unwrap.c +++ b/drivers/dma-buf/dma-fence-unwrap.c @@ -97,6 +97,9 @@ size_t dma_fence_dedup_array(struct dma_fence **fences, size_t num_fences) { size_t i, j; + if (!num_fences) + return 0; + sort(fences, num_fences, sizeof(*fences), fence_cmp, NULL); /* diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c index 0ec81a568bbd..05090fb0fd5a 100644 --- a/drivers/dma-buf/dma-fence.c +++ b/drivers/dma-buf/dma-fence.c @@ -1170,7 +1170,7 @@ const char __rcu *dma_fence_driver_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)) + if (ops) return (const char __rcu *)ops->get_driver_name(fence); else return (const char __rcu *)"detached-driver"; @@ -1203,8 +1203,8 @@ 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); + if (ops) + return (const char __rcu *)ops->get_timeline_name(fence); else return (const char __rcu *)"signaled-timeline"; } |