aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_object.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 4dddeafabd09..758d8cf8fd17 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -927,8 +927,7 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
927 size = bo->mem.num_pages << PAGE_SHIFT; 927 size = bo->mem.num_pages << PAGE_SHIFT;
928 offset = bo->mem.start << PAGE_SHIFT; 928 offset = bo->mem.start << PAGE_SHIFT;
929 /* TODO: figure out how to map scattered VRAM to the CPU */ 929 /* TODO: figure out how to map scattered VRAM to the CPU */
930 if ((offset + size) <= adev->mc.visible_vram_size && 930 if ((offset + size) <= adev->mc.visible_vram_size)
931 (abo->flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS))
932 return 0; 931 return 0;
933 932
934 /* Can't move a pinned BO to visible VRAM */ 933 /* Can't move a pinned BO to visible VRAM */
@@ -936,7 +935,6 @@ int amdgpu_bo_fault_reserve_notify(struct ttm_buffer_object *bo)
936 return -EINVAL; 935 return -EINVAL;
937 936
938 /* hurrah the memory is not visible ! */ 937 /* hurrah the memory is not visible ! */
939 abo->flags |= AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS;
940 amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM); 938 amdgpu_ttm_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_VRAM);
941 lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT; 939 lpfn = adev->mc.visible_vram_size >> PAGE_SHIFT;
942 for (i = 0; i < abo->placement.num_placement; i++) { 940 for (i = 0; i < abo->placement.num_placement; i++) {