Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca25fe5e authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

dma-buf: try to replace a signaled fence in reservation_object_add_shared_inplace 



The amdgpu issue to also need signaled fences in the reservation objects should
be fixed by now.

Optimize the handling by replacing a signaled fence when adding a new
shared one.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114142436.1360-2-christian.koenig@amd.com
parent 4d9c62e8

drivers/dma-buf/reservation.c

+15 −3
Original line number Diff line number Diff line
@@ -104,7 +104,8 @@ reservation_object_add_shared_inplace(struct reservation_object *obj, 
				      struct reservation_object_list *fobj,

				      struct dma_fence *fence)

{

	u32 i;

	struct dma_fence *signaled = NULL;

	u32 i, signaled_idx;



	dma_fence_get(fence);
@@ -126,17 +127,28 @@ reservation_object_add_shared_inplace(struct reservation_object *obj, 
			dma_fence_put(old_fence);

			return;

		}



		if (!signaled && dma_fence_is_signaled(old_fence)) {

			signaled = old_fence;

			signaled_idx = i;

		}

	}



	/*

	 * memory barrier is added by write_seqcount_begin,

	 * fobj->shared_count is protected by this lock too

	 */

	if (signaled) {

		RCU_INIT_POINTER(fobj->shared[signaled_idx], fence);

	} else {

		RCU_INIT_POINTER(fobj->shared[fobj->shared_count], fence);

		fobj->shared_count++;

	}



	write_seqcount_end(&obj->seq);

	preempt_enable();



	dma_fence_put(signaled);

}



static void