Commit ada5c48b authored by Christian König's avatar Christian König
Browse files

dma-buf: use new iterator in dma_resv_wait_timeout 



This makes the function much simpler since the complex
retry logic is now handled elsewhere.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005113742.1101-7-christian.koenig@amd.com
parent d3c80698

drivers/dma-buf/dma-resv.c

+8 −61
Original line number Diff line number Diff line
@@ -565,74 +565,21 @@ long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr, 
			   unsigned long timeout)

{

	long ret = timeout ? timeout : 1;

	unsigned int seq, shared_count;

	struct dma_resv_iter cursor;

	struct dma_fence *fence;

	int i;



retry:

	shared_count = 0;

	seq = read_seqcount_begin(&obj->seq);

	rcu_read_lock();

	i = -1;



	fence = dma_resv_excl_fence(obj);

	if (fence && !test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, &fence->flags)) {

		if (!dma_fence_get_rcu(fence))

			goto unlock_retry;



		if (dma_fence_is_signaled(fence)) {

			dma_fence_put(fence);

			fence = NULL;

		}



	} else {

		fence = NULL;

	}



	if (wait_all) {

		struct dma_resv_list *fobj = dma_resv_shared_list(obj);



		if (fobj)

			shared_count = fobj->shared_count;



		for (i = 0; !fence && i < shared_count; ++i) {

			struct dma_fence *lfence;



			lfence = rcu_dereference(fobj->shared[i]);

			if (test_bit(DMA_FENCE_FLAG_SIGNALED_BIT,

				     &lfence->flags))

				continue;



			if (!dma_fence_get_rcu(lfence))

				goto unlock_retry;



			if (dma_fence_is_signaled(lfence)) {

				dma_fence_put(lfence);

				continue;

			}

	dma_resv_iter_begin(&cursor, obj, wait_all);

	dma_resv_for_each_fence_unlocked(&cursor, fence) {



			fence = lfence;

			break;

		}

		ret = dma_fence_wait_timeout(fence, intr, ret);

		if (ret <= 0) {

			dma_resv_iter_end(&cursor);

			return ret;

		}



	rcu_read_unlock();

	if (fence) {

		if (read_seqcount_retry(&obj->seq, seq)) {

			dma_fence_put(fence);

			goto retry;

	}

	dma_resv_iter_end(&cursor);



		ret = dma_fence_wait_timeout(fence, intr, ret);

		dma_fence_put(fence);

		if (ret > 0 && wait_all && (i + 1 < shared_count))

			goto retry;

	}

	return ret;



unlock_retry:

	rcu_read_unlock();

	goto retry;

}

EXPORT_SYMBOL_GPL(dma_resv_wait_timeout);