On Tue, Dec 07, 2021 at 01:33:57PM +0100, Christian König wrote:
> This was added because of the now dropped shared on excl dependency.
>
> Signed-off-by: Christian König <christian.koenig@xxxxxxx>
I didn't do a full re-audit of whether you got them all, I think latest
with the semantic change to allow more kinds of fence types with dma-resv
we should catch them all.
Reviewed-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +----
> drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 ------
> 2 files changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index 0311d799a010..53e407ea4c89 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -1275,14 +1275,11 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
> /*
> * Work around dma_resv shortcommings by wrapping up the
> * submission in a dma_fence_chain and add it as exclusive
> - * fence, but first add the submission as shared fence to make
> - * sure that shared fences never signal before the exclusive
> - * one.
> + * fence.
> */
> dma_fence_chain_init(chain, dma_resv_excl_fence(resv),
> dma_fence_get(p->fence), 1);
>
> - dma_resv_add_shared_fence(resv, p->fence);
> rcu_assign_pointer(resv->fence_excl, &chain->base);
> e->chain = NULL;
> }
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> index a1e63ba4c54a..85d31d85c384 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
> @@ -226,12 +226,6 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
> if (!amdgpu_vm_ready(vm))
> goto out_unlock;
>
> - fence = dma_resv_excl_fence(bo->tbo.base.resv);
> - if (fence) {
> - amdgpu_bo_fence(bo, fence, true);
> - fence = NULL;
> - }
> -
> r = amdgpu_vm_clear_freed(adev, vm, &fence);
> if (r || !fence)
> goto out_unlock;
> --
> 2.25.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
