Commit acde6234 authored by Christian König's avatar Christian König

drm/amdgpu: remove excl as shared workarounds

This was added because of the now dropped shared on excl dependency.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211123142111.3885-15-christian.koenig@amd.com
parent 6387a3c4
...@@ -1275,14 +1275,11 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p, ...@@ -1275,14 +1275,11 @@ static int amdgpu_cs_submit(struct amdgpu_cs_parser *p,
/* /*
* Work around dma_resv shortcommings by wrapping up the * Work around dma_resv shortcommings by wrapping up the
* submission in a dma_fence_chain and add it as exclusive * submission in a dma_fence_chain and add it as exclusive
* fence, but first add the submission as shared fence to make * fence.
* sure that shared fences never signal before the exclusive
* one.
*/ */
dma_fence_chain_init(chain, dma_resv_excl_fence(resv), dma_fence_chain_init(chain, dma_resv_excl_fence(resv),
dma_fence_get(p->fence), 1); dma_fence_get(p->fence), 1);
dma_resv_add_shared_fence(resv, p->fence);
rcu_assign_pointer(resv->fence_excl, &chain->base); rcu_assign_pointer(resv->fence_excl, &chain->base);
e->chain = NULL; e->chain = NULL;
} }
......
...@@ -226,12 +226,6 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj, ...@@ -226,12 +226,6 @@ static void amdgpu_gem_object_close(struct drm_gem_object *obj,
if (!amdgpu_vm_ready(vm)) if (!amdgpu_vm_ready(vm))
goto out_unlock; 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); r = amdgpu_vm_clear_freed(adev, vm, &fence);
if (r || !fence) if (r || !fence)
goto out_unlock; goto out_unlock;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment