From 5b48155609cac830a2728f033e63275f0e48d6ab Mon Sep 17 00:00:00 2001 From: ozeng Date: Fri, 5 May 2017 16:19:11 -0500 Subject: [PATCH 1706/4131] drm/amdgpu: Support DGMA domain in get_dmabuf_info v2 Change-Id: I2500738f01a72962ef664dff971810a5165a517f Signed-off-by: Oak Zeng Reviewed-by: Felix Kuehling --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index 46e1954..6446d8f 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -437,8 +437,9 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, adev = obj->dev->dev_private; bo = gem_to_amdgpu_bo(obj); if (!(bo->prefered_domains & (AMDGPU_GEM_DOMAIN_VRAM | - AMDGPU_GEM_DOMAIN_GTT))) - /* Only VRAM and GTT BOs are supported */ + AMDGPU_GEM_DOMAIN_GTT | + AMDGPU_GEM_DOMAIN_DGMA))) + /* Only VRAM, GTT and DGMA BOs are supported */ goto out_put; r = 0; @@ -452,8 +453,12 @@ int amdgpu_amdkfd_get_dmabuf_info(struct kgd_dev *kgd, int dma_buf_fd, r = amdgpu_bo_get_metadata(bo, metadata_buffer, buffer_size, metadata_size, &metadata_flags); if (flags) { - *flags = (bo->prefered_domains & AMDGPU_GEM_DOMAIN_VRAM) ? - ALLOC_MEM_FLAGS_VRAM : ALLOC_MEM_FLAGS_GTT; + /* If the preferred domain is DGMA, set flags to VRAM because + * KFD doesn't support allocating DGMA memory + */ + *flags = (bo->prefered_domains & (AMDGPU_GEM_DOMAIN_VRAM | + AMDGPU_GEM_DOMAIN_DGMA)) ? + ALLOC_MEM_FLAGS_VRAM : ALLOC_MEM_FLAGS_GTT; if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) *flags |= ALLOC_MEM_FLAGS_PUBLIC; -- 2.7.4