From c8b9f6c724b591e3e6fad302248ffebfb84a198a Mon Sep 17 00:00:00 2001 From: Chaudhary Amit Kumar Date: Thu, 18 Oct 2018 18:42:40 +0530 Subject: [PATCH 1385/4131] Adaption for domain changes Changes needed due to amdgpu code change Change-Id: I6082d37a95d48c471880cbc57f324bab79798ecb Signed-off-by: Chaudhary Amit Kumar --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index daeb85f..57eef1e 100755 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -463,7 +463,7 @@ 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->initial_domain & (AMDGPU_GEM_DOMAIN_VRAM | + if (!(bo->prefered_domains & (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT))) /* Only VRAM and GTT BOs are supported */ goto out_put; @@ -479,7 +479,7 @@ 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->initial_domain & AMDGPU_GEM_DOMAIN_VRAM) ? + *flags = (bo->prefered_domains & AMDGPU_GEM_DOMAIN_VRAM) ? ALLOC_MEM_FLAGS_VRAM : ALLOC_MEM_FLAGS_GTT; if (bo->flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c index 454c247..3cbde07 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c @@ -473,8 +473,6 @@ static int reserve_bo_and_vms(struct amdgpu_device *adev, struct amdgpu_bo *bo, INIT_LIST_HEAD(&ctx->duplicates); ctx->kfd_bo.robj = bo; - ctx->kfd_bo.prefered_domains = bo->initial_domain; - ctx->kfd_bo.allowed_domains = bo->initial_domain; ctx->kfd_bo.priority = 0; ctx->kfd_bo.tv.bo = &bo->tbo; ctx->kfd_bo.tv.shared = true; @@ -1304,7 +1302,7 @@ static int get_sg_table(struct amdgpu_device *adev, goto out; } - if (bo->initial_domain == AMDGPU_GEM_DOMAIN_VRAM) + if (bo->prefered_domains == AMDGPU_GEM_DOMAIN_VRAM) page_size = AMD_GPU_PAGE_SIZE; else page_size = PAGE_SIZE; @@ -1318,7 +1316,7 @@ static int get_sg_table(struct amdgpu_device *adev, if (unlikely(ret)) goto out; - if (bo->initial_domain == AMDGPU_GEM_DOMAIN_VRAM) { + if (bo->prefered_domains == AMDGPU_GEM_DOMAIN_VRAM) { bus_addr = bo->tbo.offset + adev->mc.aper_base + offset; for_each_sg(sg->sgl, s, sg->orig_nents, i) { @@ -1419,7 +1417,7 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, int dma_buf_fd, goto out_put; bo = gem_to_amdgpu_bo(obj); - if (!(bo->initial_domain & (AMDGPU_GEM_DOMAIN_VRAM | + if (!(bo->prefered_domains & (AMDGPU_GEM_DOMAIN_VRAM | AMDGPU_GEM_DOMAIN_GTT))) /* Only VRAM and GTT BOs are supported */ goto out_put; @@ -1439,7 +1437,7 @@ int amdgpu_amdkfd_gpuvm_import_dmabuf(struct kgd_dev *kgd, int dma_buf_fd, (*mem)->data2.bo = amdgpu_bo_ref(bo); (*mem)->data2.va = va; - (*mem)->data2.domain = (bo->initial_domain & AMDGPU_GEM_DOMAIN_VRAM) ? + (*mem)->data2.domain = (bo->prefered_domains & AMDGPU_GEM_DOMAIN_VRAM) ? AMDGPU_GEM_DOMAIN_VRAM : AMDGPU_GEM_DOMAIN_GTT; (*mem)->data2.mapped_to_gpu_memory = 0; -- 2.7.4