diff options
| author | Christian König <christian.koenig@amd.com> | 2022-07-11 16:48:01 +0200 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2022-07-14 14:41:30 +0200 |
| commit | 4fa05a67b558d2cb3acd2bb299b91220d405ca5e (patch) | |
| tree | 58f17494fbc0e272732f23470a65e1d756348b16 /drivers/dma-buf | |
| parent | f83d9396d1f63048c423efa00e4e244da10a35fd (diff) | |
| download | linux-stable-4fa05a67b558d2cb3acd2bb299b91220d405ca5e.tar.gz linux-stable-4fa05a67b558d2cb3acd2bb299b91220d405ca5e.tar.bz2 linux-stable-4fa05a67b558d2cb3acd2bb299b91220d405ca5e.zip | |
dma-buf: revert "return only unsignaled fences in dma_fence_unwrap_for_each v3"
This reverts commit 8f61973718485f3e89bc4f408f929048b7b47c83.
It turned out that this is not correct. Especially the sync_file info
IOCTL needs to see even signaled fences to correctly report back their
status to userspace.
Instead add the filter in the merge function again where it makes sense.
Signed-off-by: Christian König <christian.koenig@amd.com>
Tested-by: Karolina Drobnik <karolina.drobnik@intel.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220712102849.1562-1-christian.koenig@amd.com
Diffstat (limited to 'drivers/dma-buf')
| -rw-r--r-- | drivers/dma-buf/dma-fence-unwrap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma-buf/dma-fence-unwrap.c b/drivers/dma-buf/dma-fence-unwrap.c index 502a65ea6d44..7002bca792ff 100644 --- a/drivers/dma-buf/dma-fence-unwrap.c +++ b/drivers/dma-buf/dma-fence-unwrap.c @@ -72,7 +72,8 @@ struct dma_fence *__dma_fence_unwrap_merge(unsigned int num_fences, count = 0; for (i = 0; i < num_fences; ++i) { dma_fence_unwrap_for_each(tmp, &iter[i], fences[i]) - ++count; + if (!dma_fence_is_signaled(tmp)) + ++count; } if (count == 0) |