Commit 36ffc58b authored by Pierre-Eric Pelloux-Prayer's avatar Pierre-Eric Pelloux-Prayer Committed by Alex Deucher
Browse files

drm/amdgpu: lock bo before calling amdgpu_vm_bo_update_shared 



BO's reservation object must be locked before using
amdgpu_vm_bo_update_shared otherwise dma_resv_assert_held will
complain in amdgpu_vm_update_shared.

Signed-off-by: default avatarPierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c72d41a8

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

+7 −0
Original line number Diff line number Diff line
@@ -81,13 +81,20 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, 
	struct drm_gem_object *obj = dmabuf->priv;

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);

	struct amdgpu_device *adev = amdgpu_ttm_adev(bo->tbo.bdev);

	int r;



	if (!amdgpu_dmabuf_is_xgmi_accessible(attach_adev, bo) &&

	    pci_p2pdma_distance(adev->pdev, attach->dev, false) < 0)

		attach->peer2peer = false;



	r = dma_resv_lock(bo->tbo.base.resv, NULL);

	if (r)

		return r;



	amdgpu_vm_bo_update_shared(bo);



	dma_resv_unlock(bo->tbo.base.resv);



	return 0;

}