diff options
| author | Dave Airlie <airlied@redhat.com> | 2023-12-12 02:32:33 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2023-12-12 02:32:33 +0100 |
| commit | c1ee197d64f49c9e2a6c8e6a168083c411c1362c (patch) | |
| tree | ec8568a9d11ce55989c212efc4769cccc680964e /drivers/dma-buf | |
| parent | Merge tag 'drm-misc-next-2023-12-07' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| parent | Linux 6.7-rc5 (diff) | |
| download | linux-c1ee197d64f49c9e2a6c8e6a168083c411c1362c.tar.xz linux-c1ee197d64f49c9e2a6c8e6a168083c411c1362c.zip | |
Backmerge tag 'v6.7-rc5' into drm-next
Linux 6.7-rc5
Alex requested this for some amdkfd work relying on the symbols exports.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/dma-resv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c index 38b4110378de..eb8b733065b2 100644 --- a/drivers/dma-buf/dma-resv.c +++ b/drivers/dma-buf/dma-resv.c @@ -301,7 +301,7 @@ void dma_resv_add_fence(struct dma_resv *obj, struct dma_fence *fence, dma_resv_list_entry(fobj, i, obj, &old, &old_usage); if ((old->context == fence->context && old_usage >= usage && - dma_fence_is_later(fence, old)) || + dma_fence_is_later_or_same(fence, old)) || dma_fence_is_signaled(old)) { dma_resv_list_set(fobj, i, fence, usage); dma_fence_put(old); |