Skip to content

Commit a71f395

Browse files
committed
Merge tag 'drm-misc-fixes-2022-08-31' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
Short summary of fixes pull: * dma-buf/dma-resv: Fence-handling fix Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/Yw+pZnEbPxkJ1nHa@linux-uq9g.fritz.box
2 parents a54569b + a3f7c10 commit a71f395

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/dma-buf/dma-resv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,8 @@ void dma_resv_add_fence(struct dma_resv *obj, struct dma_fence *fence,
295295
enum dma_resv_usage old_usage;
296296

297297
dma_resv_list_entry(fobj, i, obj, &old, &old_usage);
298-
if ((old->context == fence->context && old_usage >= usage) ||
298+
if ((old->context == fence->context && old_usage >= usage &&
299+
dma_fence_is_later(fence, old)) ||
299300
dma_fence_is_signaled(old)) {
300301
dma_resv_list_set(fobj, i, fence, usage);
301302
dma_fence_put(old);

0 commit comments

Comments
 (0)