[PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[Jammy Zhou]

When the timeout value passed to reservation_object_wait_timeout_rcu
is zero, no wait should be done if the fences are not signaled.

Return '1' for idle and '0' for busy if the specified timeout is '0'
to keep consistent with the case of non-zero timeout.

v2: call fence_put if not signaled in the case of timeout==0

v3: switch to reservation_object_test_signaled_rcu

Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/dma-buf/reservation.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
index 3c97c8f..807ef15 100644
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -327,6 +327,9 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
 	unsigned seq, shared_count, i = 0;
 	long ret = timeout;
 
+	if (!timeout)
+		return reservation_object_test_signaled_rcu(obj, wait_all);
+
 retry:
 	fence = NULL;
 	shared_count = 0;
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[Maarten Lankhorst]

Op 21-01-15 om 11:35 schreef Jammy Zhou:
> When the timeout value passed to reservation_object_wait_timeout_rcu
> is zero, no wait should be done if the fences are not signaled.
>
> Return '1' for idle and '0' for busy if the specified timeout is '0'
> to keep consistent with the case of non-zero timeout.
>
> v2: call fence_put if not signaled in the case of timeout==0
>
> v3: switch to reservation_object_test_signaled_rcu
>
> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
> Reviewed-by: Christian König <christian.koenig@amd.com>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
Reviewed-By: Maarten Lankhorst <maarten.lankhorst@canonical.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[Alex Deucher]

On Wed, Jan 21, 2015 at 5:31 AM, Maarten Lankhorst
<maarten.lankhorst@canonical.com> wrote:
> Op 21-01-15 om 11:35 schreef Jammy Zhou:
>> When the timeout value passed to reservation_object_wait_timeout_rcu
>> is zero, no wait should be done if the fences are not signaled.
>>
>> Return '1' for idle and '0' for busy if the specified timeout is '0'
>> to keep consistent with the case of non-zero timeout.
>>
>> v2: call fence_put if not signaled in the case of timeout==0
>>
>> v3: switch to reservation_object_test_signaled_rcu
>>
>> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
>> Reviewed-by: Christian König <christian.koenig@amd.com>
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>
> Reviewed-By: Maarten Lankhorst <maarten.lankhorst@canonical.com>

Dave, Maarten,

Do you want to pick these up, or would you rather I pulled them through my tree?

Thanks,

Alex
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[Maarten Lankhorst]

Hey,

On 21-01-15 17:16, Alex Deucher wrote:
> On Wed, Jan 21, 2015 at 5:31 AM, Maarten Lankhorst
> <maarten.lankhorst@canonical.com> wrote:
>> Op 21-01-15 om 11:35 schreef Jammy Zhou:
>>> When the timeout value passed to reservation_object_wait_timeout_rcuy,
>>> is zero, no wait should be done if the fences are not signaled.
>>>
>>> Return '1' for idle and '0' for busy if the specified timeout is '0'
>>> to keep consistent with the case of non-zero timeout.
>>>
>>> v2: call fence_put if not signaled in the case of timeout==0
>>>
>>> v3: switch to reservation_object_test_signaled_rcu
>>>
>>> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
>>> Reviewed-by: Christian König <christian.koenig@amd.com>
>>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>>
>> Reviewed-By: Maarten Lankhorst <maarten.lankhorst@canonical.com>
> 
> Dave, Maarten,
> 
> Do you want to pick these up, or would you rather I pulled them through my tree?
This goes through Sumit Semwal's tree. He's the dma-buf maintainer and I already made him aware of the patches.

~Maarten
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[Alex Deucher]

On Wed, Jan 21, 2015 at 12:30 PM, Maarten Lankhorst
<maarten.lankhorst@canonical.com> wrote:
> Hey,
>
> On 21-01-15 17:16, Alex Deucher wrote:
>> On Wed, Jan 21, 2015 at 5:31 AM, Maarten Lankhorst
>> <maarten.lankhorst@canonical.com> wrote:
>>> Op 21-01-15 om 11:35 schreef Jammy Zhou:
>>>> When the timeout value passed to reservation_object_wait_timeout_rcuy,
>>>> is zero, no wait should be done if the fences are not signaled.
>>>>
>>>> Return '1' for idle and '0' for busy if the specified timeout is '0'
>>>> to keep consistent with the case of non-zero timeout.
>>>>
>>>> v2: call fence_put if not signaled in the case of timeout==0
>>>>
>>>> v3: switch to reservation_object_test_signaled_rcu
>>>>
>>>> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
>>>> Reviewed-by: Christian König <christian.koenig@amd.com>
>>>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>>>
>>> Reviewed-By: Maarten Lankhorst <maarten.lankhorst@canonical.com>
>>
>> Dave, Maarten,
>>
>> Do you want to pick these up, or would you rather I pulled them through my tree?
> This goes through Sumit Semwal's tree. He's the dma-buf maintainer and I already made him aware of the patches.


Thanks!

Alex
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 1/2] reservation: wait only with non-zero timeout specified (v3)

[Sumit Semwal]

Hi Jammy, All,


On 21 January 2015 at 23:04, Alex Deucher <alexdeucher@gmail.com> wrote:
> On Wed, Jan 21, 2015 at 12:30 PM, Maarten Lankhorst
> <maarten.lankhorst@canonical.com> wrote:
>> Hey,
>>
>> On 21-01-15 17:16, Alex Deucher wrote:
>>> On Wed, Jan 21, 2015 at 5:31 AM, Maarten Lankhorst
>>> <maarten.lankhorst@canonical.com> wrote:
>>>> Op 21-01-15 om 11:35 schreef Jammy Zhou:
>>>>> When the timeout value passed to reservation_object_wait_timeout_rcuy,
>>>>> is zero, no wait should be done if the fences are not signaled.
>>>>>
>>>>> Return '1' for idle and '0' for busy if the specified timeout is '0'
>>>>> to keep consistent with the case of non-zero timeout.
>>>>>
>>>>> v2: call fence_put if not signaled in the case of timeout==0
>>>>>
>>>>> v3: switch to reservation_object_test_signaled_rcu
>>>>>
>>>>> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
>>>>> Reviewed-by: Christian König <christian.koenig@amd.com>
>>>>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>>>>
>>>> Reviewed-By: Maarten Lankhorst <maarten.lankhorst@canonical.com>
>>>
>>> Dave, Maarten,
>>>
>>> Do you want to pick these up, or would you rather I pulled them through my tree?
>> This goes through Sumit Semwal's tree. He's the dma-buf maintainer and I already made him aware of the patches.
>
Both these patches are now pulled and pushed out to my for-next branch.
>
> Thanks!
>
> Alex

-- 
Thanks and Best regards,
Sumit.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 2/2] dma-buf/fence: don't wait when specified timeout is zero

[Jammy Zhou]

When specified timeout is zero for fence_wait_timeout, just check if the fence
is signaled or not without wait.

Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
---
 drivers/dma-buf/fence.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c
index e554111..50ef8bd 100644
--- a/drivers/dma-buf/fence.c
+++ b/drivers/dma-buf/fence.c
@@ -159,6 +159,9 @@ fence_wait_timeout(struct fence *fence, bool intr, signed long timeout)
 	if (WARN_ON(timeout < 0))
 		return -EINVAL;
 
+	if (timeout == 0)
+		return fence_is_signaled(fence);
+
 	trace_fence_wait_start(fence);
 	ret = fence->ops->wait(fence, intr, timeout);
 	trace_fence_wait_end(fence);
-- 
1.9.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/2] dma-buf/fence: don't wait when specified timeout is zero

[Maarten Lankhorst]

Op 21-01-15 om 11:35 schreef Jammy Zhou:
> When specified timeout is zero for fence_wait_timeout, just check if the fence
> is signaled or not without wait.
>
> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>
>
Reviewed-By: Maarten Lankhorst <maarten.lankhorst@canonical.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 2/2] dma-buf/fence: don't wait when specified timeout is zero

[Christian König]

Am 21.01.2015 um 11:35 schrieb Jammy Zhou:
> When specified timeout is zero for fence_wait_timeout, just check if the fence
> is signaled or not without wait.
>
> Signed-off-by: Jammy Zhou <Jammy.Zhou@amd.com>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/dma-buf/fence.c | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/drivers/dma-buf/fence.c b/drivers/dma-buf/fence.c
> index e554111..50ef8bd 100644
> --- a/drivers/dma-buf/fence.c
> +++ b/drivers/dma-buf/fence.c
> @@ -159,6 +159,9 @@ fence_wait_timeout(struct fence *fence, bool intr, signed long timeout)
>   	if (WARN_ON(timeout < 0))
>   		return -EINVAL;
>   
> +	if (timeout == 0)
> +		return fence_is_signaled(fence);
> +
>   	trace_fence_wait_start(fence);
>   	ret = fence->ops->wait(fence, intr, timeout);
>   	trace_fence_wait_end(fence);

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel