Commit f5e7fabd authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: allow pinning DMA-bufs into VRAM if all importers can do P2P 



Try pinning into VRAM to allow P2P with RDMA NICs without ODP
support if all attachments can do P2P. If any attachment can't do
P2P just pin into GTT instead.

Acked-by: default avatarSimona Vetter <simona.vetter@ffwll.ch>
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Tested-by: default avatarPak Nin Lui <pak.lui@amd.com>
Cc: Simona Vetter <simona.vetter@ffwll.ch>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1b5447d7

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

+18 −7
Original line number Diff line number Diff line
@@ -75,11 +75,25 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, 
 */

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);

	struct dma_buf *dmabuf = attach->dmabuf;

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

	u32 domains = bo->preferred_domains;



	dma_resv_assert_held(dmabuf->resv);



	/*

	 * Try pinning into VRAM to allow P2P with RDMA NICs without ODP

	 * support if all attachments can do P2P. If any attachment can't do

	 * P2P just pin into GTT instead.

	 */

	list_for_each_entry(attach, &dmabuf->attachments, node)

		if (!attach->peer2peer)

			domains &= ~AMDGPU_GEM_DOMAIN_VRAM;



	if (domains & AMDGPU_GEM_DOMAIN_VRAM)

		bo->flags |= AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED;



	/* pin buffer into GTT */

	return amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	return amdgpu_bo_pin(bo, domains);

}



/**
@@ -134,9 +148,6 @@ static struct sg_table *amdgpu_dma_buf_map(struct dma_buf_attachment *attach, 
		r = ttm_bo_validate(&bo->tbo, &bo->placement, &ctx);

		if (r)

			return ERR_PTR(r);



	} else if (bo->tbo.resource->mem_type != TTM_PL_TT) {

		return ERR_PTR(-EBUSY);

	}



	switch (bo->tbo.resource->mem_type) {