Commit a71f3950 authored by Dave Airlie's avatar Dave Airlie
Browse files

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: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Yw+pZnEbPxkJ1nHa@linux-uq9g.fritz.box
parents a54569b1 a3f7c10a

drivers/dma-buf/dma-resv.c

+2 −1
Original line number Diff line number Diff line
@@ -295,7 +295,8 @@ void dma_resv_add_fence(struct dma_resv *obj, struct dma_fence *fence, 
		enum dma_resv_usage old_usage;



		dma_resv_list_entry(fobj, i, obj, &old, &old_usage);

		if ((old->context == fence->context && old_usage >= usage) ||

		if ((old->context == fence->context && old_usage >= usage &&

		     dma_fence_is_later(fence, old)) ||

		    dma_fence_is_signaled(old)) {

			dma_resv_list_set(fobj, i, fence, usage);

			dma_fence_put(old);