drm/amdgpu: use TTM_PL_FLAG_CONTIGUOUS v2

Implement AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS using TTM_PL_FLAG_CONTIGUOUS
instead of a placement limit. That allows us to better handle CPU
accessible placements.

v2: prevent virtual BO start address from overflowing

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
index 5aac350b007f..4dddeafabd09 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -122,20 +122,19 @@ static void amdgpu_ttm_placement_init(struct amdgpu_device *adev,
 
         if (domain & AMDGPU_GEM_DOMAIN_VRAM) {
                 unsigned visible_pfn = adev->mc.visible_vram_size >> PAGE_SHIFT;
-                unsigned lpfn = 0;
-
-                /* This forces a reallocation if the flag wasn't set before */
-                if (flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)
-                        lpfn = adev->mc.real_vram_size >> PAGE_SHIFT;
 
                 places[c].fpfn = 0;
-                places[c].lpfn = lpfn;
+                places[c].lpfn = 0;
                 places[c].flags = TTM_PL_FLAG_WC | TTM_PL_FLAG_UNCACHED |
                         TTM_PL_FLAG_VRAM;
+
                 if (flags & AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED)
                         places[c].lpfn = visible_pfn;
                 else
                         places[c].flags |= TTM_PL_FLAG_TOPDOWN;
+
+                if (flags & AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS)
+                        places[c].flags |= TTM_PL_FLAG_CONTIGUOUS;
                 c++;
         }