Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / dma-buf / dma-resv.c

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index cab4f41f0470450326e35ee2b66b87ee46b5a2d9..e2869fb311403964b492d2e5d9f0d37993c8bff5 100644 (file)
--- 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);