* [PATCH] drm/amdgpu: fix amdgpu_sync_resv v2
@ 2017-11-24 12:49 Christian König
[not found] ` <20171124124935.24638-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2017-11-24 12:49 UTC (permalink / raw)
To: andresx7-Re5JQEeQqe8AvxtiuMwx3w,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Fixes a bug introduced by AMDGPU_GEM_CREATE_EXPLICIT_SYNC. We still need
to wait for pipelined moves in the shared fences list.
v2: fix typo
Signed-off-by: Christian König <christian.koenig@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
index a4bf21f8f1c1..bbbc40d630a0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
@@ -191,9 +191,6 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
f = reservation_object_get_excl(resv);
r = amdgpu_sync_fence(adev, sync, f);
- if (explicit_sync)
- return r;
-
flist = reservation_object_get_list(resv);
if (!flist || r)
return r;
@@ -212,11 +209,11 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
(fence_owner == AMDGPU_FENCE_OWNER_VM)))
continue;
- /* Ignore fence from the same owner as
+ /* Ignore fence from the same owner and explicit one as
* long as it isn't undefined.
*/
if (owner != AMDGPU_FENCE_OWNER_UNDEFINED &&
- fence_owner == owner)
+ (fence_owner == owner || explicit_sync))
continue;
}
--
2.11.0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: fix amdgpu_sync_resv v2
[not found] ` <20171124124935.24638-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
@ 2017-11-29 13:10 ` Christian König
[not found] ` <b4f12864-9073-47bb-6ba1-cd1fae3b29c9-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Christian König @ 2017-11-29 13:10 UTC (permalink / raw)
To: andresx7-Re5JQEeQqe8AvxtiuMwx3w,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Hi Andres,
just a gentle ping to see if you have noticed this.
Thanks,
Christian.
Am 24.11.2017 um 13:49 schrieb Christian König:
> Fixes a bug introduced by AMDGPU_GEM_CREATE_EXPLICIT_SYNC. We still need
> to wait for pipelined moves in the shared fences list.
>
> v2: fix typo
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> index a4bf21f8f1c1..bbbc40d630a0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
> @@ -191,9 +191,6 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
> f = reservation_object_get_excl(resv);
> r = amdgpu_sync_fence(adev, sync, f);
>
> - if (explicit_sync)
> - return r;
> -
> flist = reservation_object_get_list(resv);
> if (!flist || r)
> return r;
> @@ -212,11 +209,11 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
> (fence_owner == AMDGPU_FENCE_OWNER_VM)))
> continue;
>
> - /* Ignore fence from the same owner as
> + /* Ignore fence from the same owner and explicit one as
> * long as it isn't undefined.
> */
> if (owner != AMDGPU_FENCE_OWNER_UNDEFINED &&
> - fence_owner == owner)
> + (fence_owner == owner || explicit_sync))
> continue;
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu: fix amdgpu_sync_resv v2
[not found] ` <b4f12864-9073-47bb-6ba1-cd1fae3b29c9-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2017-11-29 16:22 ` Andres Rodriguez
0 siblings, 0 replies; 3+ messages in thread
From: Andres Rodriguez @ 2017-11-29 16:22 UTC (permalink / raw)
To: Christian König, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Cc: andresx7-Re5JQEeQqe8AvxtiuMwx3w
On 2017-11-29 08:10 AM, Christian König wrote:
> Hi Andres,
>
> just a gentle ping to see if you have noticed this.
>
> Thanks,
> Christian.
>
> Am 24.11.2017 um 13:49 schrieb Christian König:
>> Fixes a bug introduced by AMDGPU_GEM_CREATE_EXPLICIT_SYNC. We still need
>> to wait for pipelined moves in the shared fences list.
>>
>> v2: fix typo
>>
>> Signed-off-by: Christian König <christian.koenig@amd.com>
Hi Christian,
Sorry, last few weeks have been a little hectic.
This patch looks good to me. You can add:
Reviewed-by: Andres Rodriguez <andresx7@gmail.com>
The steamvr explicit sync use cases are untouched by this patch, so we
should be good on that front as well.
Kind Regards,
Andres
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 7 ++-----
>> 1 file changed, 2 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> index a4bf21f8f1c1..bbbc40d630a0 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c
>> @@ -191,9 +191,6 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
>> f = reservation_object_get_excl(resv);
>> r = amdgpu_sync_fence(adev, sync, f);
>> - if (explicit_sync)
>> - return r;
>> -
>> flist = reservation_object_get_list(resv);
>> if (!flist || r)
>> return r;
>> @@ -212,11 +209,11 @@ int amdgpu_sync_resv(struct amdgpu_device *adev,
>> (fence_owner == AMDGPU_FENCE_OWNER_VM)))
>> continue;
>> - /* Ignore fence from the same owner as
>> + /* Ignore fence from the same owner and explicit one as
>> * long as it isn't undefined.
>> */
>> if (owner != AMDGPU_FENCE_OWNER_UNDEFINED &&
>> - fence_owner == owner)
>> + (fence_owner == owner || explicit_sync))
>> continue;
>> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-29 16:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-24 12:49 [PATCH] drm/amdgpu: fix amdgpu_sync_resv v2 Christian König
[not found] ` <20171124124935.24638-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2017-11-29 13:10 ` Christian König
[not found] ` <b4f12864-9073-47bb-6ba1-cd1fae3b29c9-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-11-29 16:22 ` Andres Rodriguez
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.