From: jsg Date: Mon, 11 Dec 2023 05:15:39 +0000 (+0000) Subject: dma-buf: fix check in dma_resv_add_fence X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3e2d38fbbec37fa3ef1e6bb8111dc7bbae6e3c5c;p=openbsd dma-buf: fix check in dma_resv_add_fence From Christian Koenig fc98ea2699c090e0377d16d733dca7a0b7508237 in linux-6.1.y/6.1.66 95ba893c9f4feb836ddce627efd0bb6af6667031 in mainline linux --- diff --git a/sys/dev/pci/drm/dma-resv.c b/sys/dev/pci/drm/dma-resv.c index d3f7c01f3e0..0f2e297ee13 100644 --- a/sys/dev/pci/drm/dma-resv.c +++ b/sys/dev/pci/drm/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);