diff options
| author | Christian König <christian.koenig@amd.com> | 2023-06-13 10:09:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-03 10:26:14 +0200 |
| commit | 6bd9952eade5bbcd099083ca782ad674f6b32637 (patch) | |
| tree | 8189f0f170d05f2393fbb4e0f5ebef1ebea769d2 /include/linux | |
| parent | e872d6b6ea4947fb87f0d6ea1ef814019dbed89e (diff) | |
| download | linux-stable-6bd9952eade5bbcd099083ca782ad674f6b32637.tar.gz linux-stable-6bd9952eade5bbcd099083ca782ad674f6b32637.tar.bz2 linux-stable-6bd9952eade5bbcd099083ca782ad674f6b32637.zip | |
dma-buf: keep the signaling time of merged fences v3
commit f781f661e8c99b0cb34129f2e374234d61864e77 upstream.
Some Android CTS is testing if the signaling time keeps consistent
during merges.
v2: use the current time if the fence is still in the signaling path and
the timestamp not yet available.
v3: improve comment, fix one more case to use the correct timestamp
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230630120041.109216-1-christian.koenig@amd.com
Cc: Jindong Yue <jindong.yue@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-fence.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index d54b595a0fe0..0d678e9a7b24 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -606,7 +606,7 @@ static inline signed long dma_fence_wait(struct dma_fence *fence, bool intr) void dma_fence_set_deadline(struct dma_fence *fence, ktime_t deadline); struct dma_fence *dma_fence_get_stub(void); -struct dma_fence *dma_fence_allocate_private_stub(void); +struct dma_fence *dma_fence_allocate_private_stub(ktime_t timestamp); u64 dma_fence_context_alloc(unsigned num); extern const struct dma_fence_ops dma_fence_array_ops; |