2022-09-14 17:03:41

by Arvind Yadav

Subject: [PATCH v4 4/6] dma-buf: dma_fence_wait must enable signaling

dma_fence_wait() should always enable signaling even
when the fence is already signaled.

Signed-off-by: Arvind Yadav <[email protected]>
---

Changes in v1..v3: This new patch was not part of previous series.

---

drivers/dma-buf/dma-fence.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index 645c158b7e01..a5fbf1c1e0ea 100644
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -508,6 +508,8 @@ dma_fence_wait_timeout(struct dma_fence *fence, bool intr, signed long timeout)

__dma_fence_might_wait();

+ dma_fence_enable_sw_signaling(fence);
+
trace_dma_fence_wait_start(fence);
if (fence->ops->wait)
ret = fence->ops->wait(fence, intr, timeout);
@@ -771,9 +773,6 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout)
goto out;
}

- if (!__dma_fence_enable_signaling(fence))
- goto out;
-
if (!timeout) {
ret = 0;
goto out;
--
2.25.1

2022-09-15 12:11:45

by Christian König

Subject: Re: [PATCH v4 4/6] dma-buf: dma_fence_wait must enable signaling

Am 14.09.22 um 18:43 schrieb Arvind Yadav:
> dma_fence_wait() should always enable signaling even
> when the fence is already signaled.
>
> Signed-off-by: Arvind Yadav <[email protected]>

Reviewed-by: Christian König <[email protected]>

> ---
>
> Changes in v1..v3: This new patch was not part of previous series.
>
> ---
>
> drivers/dma-buf/dma-fence.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
> index 645c158b7e01..a5fbf1c1e0ea 100644
> --- a/drivers/dma-buf/dma-fence.c
> +++ b/drivers/dma-buf/dma-fence.c
> @@ -508,6 +508,8 @@ dma_fence_wait_timeout(struct dma_fence *fence, bool intr, signed long timeout)
>
> __dma_fence_might_wait();
>
> + dma_fence_enable_sw_signaling(fence);
> +
> trace_dma_fence_wait_start(fence);
> if (fence->ops->wait)
> ret = fence->ops->wait(fence, intr, timeout);
> @@ -771,9 +773,6 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout)
> goto out;
> }
>
> - if (!__dma_fence_enable_signaling(fence))
> - goto out;
> -
> if (!timeout) {
> ret = 0;
> goto out;