iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dma-buf: use new iterator in dma_resv_wait_timeout

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

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211005113742.1101-7-christian.koenig@amd.com
This commit is contained in:
Christian König 2021-06-15 15:28:03 +02:00
parent d3c80698c9
commit ada5c48b11
1 changed files with 9 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
drivers/dma-buf/dma-resv.c
View File

@ -565,74 +565,21 @@ long dma_resv_wait_timeout(struct dma_resv *obj, bool wait_all, bool intr,
unsigned long timeout) unsigned long timeout)
{ {
long ret = timeout ? timeout : 1; long ret = timeout ? timeout : 1;
unsigned int seq, shared_count; struct dma_resv_iter cursor;
struct dma_fence *fence; struct dma_fence *fence;
int i;
retry: dma_resv_iter_begin(&cursor, obj, wait_all);
shared_count = 0; dma_resv_for_each_fence_unlocked(&cursor, fence) {
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;
}
fence = lfence;
break;
}
}
rcu_read_unlock();
if (fence) {
if (read_seqcount_retry(&obj->seq, seq)) {
dma_fence_put(fence);
goto retry;
}
ret = dma_fence_wait_timeout(fence, intr, ret); ret = dma_fence_wait_timeout(fence, intr, ret);
dma_fence_put(fence); if (ret <= 0) {
if (ret > 0 && wait_all && (i + 1 < shared_count)) dma_resv_iter_end(&cursor);
goto retry;
}
return ret; return ret;
}
}
dma_resv_iter_end(&cursor);
unlock_retry: return ret;
rcu_read_unlock();
goto retry;
} }
EXPORT_SYMBOL_GPL(dma_resv_wait_timeout); EXPORT_SYMBOL_GPL(dma_resv_wait_timeout);