Commit acde6234 authored Nov 03, 2021 by 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: Christian König <christian.koenig@amd.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211123142111.3885-15-christian.koenig@amd.com

parent 6387a3c4

drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -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;