diff options
| author | Christian König <christian.koenig@amd.com> | 2021-10-28 13:19:22 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-01-19 10:03:56 +0100 |
| commit | 75ab2b3633ccddd8f7bdf6c76f9ab3f9b2fc5d9d (patch) | |
| tree | c27df22013a20ca19062dcee94301250fb0abe84 /drivers/dma-buf/st-dma-resv.c | |
| parent | acde6234f65bad89a2e27d3e8dd2daf680862545 (diff) | |
| download | linux-75ab2b3633ccddd8f7bdf6c76f9ab3f9b2fc5d9d.tar.gz | |
dma-buf: drop excl_fence parameter from dma_resv_get_fences
Returning the exclusive fence separately is no longer used.
Instead add a write parameter to indicate the use case.
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/20211207123411.167006-4-christian.koenig@amd.com
Diffstat (limited to 'drivers/dma-buf/st-dma-resv.c')
| -rw-r--r-- | drivers/dma-buf/st-dma-resv.c | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/drivers/dma-buf/st-dma-resv.c b/drivers/dma-buf/st-dma-resv.c index bc32b3eedcb6..cbe999c6e7a6 100644 --- a/drivers/dma-buf/st-dma-resv.c +++ b/drivers/dma-buf/st-dma-resv.c @@ -275,7 +275,7 @@ static int test_shared_for_each_unlocked(void *arg) static int test_get_fences(void *arg, bool shared) { - struct dma_fence *f, *excl = NULL, **fences = NULL; + struct dma_fence *f, **fences = NULL; struct dma_resv resv; int r, i; @@ -304,35 +304,19 @@ static int test_get_fences(void *arg, bool shared) } dma_resv_unlock(&resv); - r = dma_resv_get_fences(&resv, &excl, &i, &fences); + r = dma_resv_get_fences(&resv, shared, &i, &fences); if (r) { pr_err("get_fences failed\n"); goto err_free; } - if (shared) { - if (excl != NULL) { - pr_err("get_fences returned unexpected excl fence\n"); - goto err_free; - } - if (i != 1 || fences[0] != f) { - pr_err("get_fences returned unexpected shared fence\n"); - goto err_free; - } - } else { - if (excl != f) { - pr_err("get_fences returned unexpected excl fence\n"); - goto err_free; - } - if (i != 0) { - pr_err("get_fences returned unexpected shared fence\n"); - goto err_free; - } + if (i != 1 || fences[0] != f) { + pr_err("get_fences returned unexpected fence\n"); + goto err_free; } dma_fence_signal(f); err_free: - dma_fence_put(excl); while (i--) dma_fence_put(fences[i]); kfree(fences); |