Commit 3940796a authored by Felix Kuehling's avatar Felix Kuehling Committed by Alex Deucher
Browse files

drm/amdgpu: Use allowed_domains for pinning dmabufs 



When determining the domains for pinning DMABufs, filter allowed_domains
and fail with a warning if VRAM is forbidden and GTT is not an allowed
domain.

Fixes: f5e7fabd ("drm/amdgpu: allow pinning DMA-bufs into VRAM if all importers can do P2P")
Suggested-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cb808ab8

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

+4 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static int amdgpu_dma_buf_pin(struct dma_buf_attachment *attach) 
{

	struct dma_buf *dmabuf = attach->dmabuf;

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(dmabuf->priv);

	u32 domains = bo->preferred_domains;

	u32 domains = bo->allowed_domains;



	dma_resv_assert_held(dmabuf->resv);
@@ -93,6 +93,9 @@ static int amdgpu_dma_buf_pin(struct dma_buf_attachment *attach) 
	if (domains & AMDGPU_GEM_DOMAIN_VRAM)

		bo->flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;



	if (WARN_ON(!domains))

		return -EINVAL;



	return amdgpu_bo_pin(bo, domains);

}