From be40d43c25ccd75c8e7455ad386ba7a24a7f3c03 Mon Sep 17 00:00:00 2001 From: Flora Cui Date: Fri, 9 Sep 2016 14:24:11 +0800 Subject: [PATCH 0773/4131] drm/amdgpu: update gpuvm for direct gma domains Change-Id: If44ee4a1ae2ece1d9b300fe980dd33b96ca65a3b Signed-off-by: Flora Cui Reviewed-by: Hawking Zhang Signed-off-by: Junwei Zhang Conflicts: drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c index f56889b..f94ca9d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c @@ -1779,6 +1779,8 @@ int amdgpu_vm_bo_update(struct amdgpu_device *adev, ttm = container_of(bo_va->base.bo->tbo.ttm, struct ttm_dma_tt, ttm); pages_addr = ttm->dma_address; + } else if (mem->mem_type == AMDGPU_PL_DGMA_IMPORT) { + pages_addr = (dma_addr_t *)bo_va->bo->tbo.mem.bus.base; } exclusive = reservation_object_get_excl(bo->tbo.resv); } -- 2.7.4