Commit 8ddf5b9b authored by Christian König's avatar Christian König
Browse files

drm/amdgpu: wait for moving fence after pinning 



We actually need to wait for the moving fence after pinning
the BO to make sure that the pin is completed.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
References: https://lore.kernel.org/dri-devel/20210621151758.2347474-1-daniel.vetter@ffwll.ch/
CC: stable@kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20210622114506.106349-3-christian.koenig@amd.com
parent 4b41726a

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

+13 −1
Original line number Diff line number Diff line
@@ -214,9 +214,21 @@ static int amdgpu_dma_buf_pin(struct dma_buf_attachment *attach) 
{

	struct drm_gem_object *obj = attach->dmabuf->priv;

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);

	int r;



	/* pin buffer into GTT */

	return amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	if (r)

		return r;



	if (bo->tbo.moving) {

		r = dma_fence_wait(bo->tbo.moving, true);

		if (r) {

			amdgpu_bo_unpin(bo);

			return r;

		}

	}

	return 0;

}



/**