[Intel-gfx] [RFC PATCH 1/7] drm/i915: instantiate ttm ranger manager for stolen memory

[Robert Beckett]

Signed-off-by: Robert Beckett <bob.beck...@collabora.com>
---
 drivers/gpu/drm/i915/intel_region_ttm.c | 29 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_region_ttm.c 
b/drivers/gpu/drm/i915/intel_region_ttm.c
index 737ef3f4ab54..bb564b830c96 100644
--- a/drivers/gpu/drm/i915/intel_region_ttm.c
+++ b/drivers/gpu/drm/i915/intel_region_ttm.c
@@ -57,11 +57,17 @@ int intel_region_to_ttm_type(const struct 
intel_memory_region *mem)
 
        GEM_BUG_ON(mem->type != INTEL_MEMORY_LOCAL &&
                   mem->type != INTEL_MEMORY_MOCK &&
-                  mem->type != INTEL_MEMORY_SYSTEM);
+                  mem->type != INTEL_MEMORY_SYSTEM &&
+                  mem->type != INTEL_MEMORY_STOLEN_SYSTEM &&
+                  mem->type != INTEL_MEMORY_STOLEN_LOCAL);
 
        if (mem->type == INTEL_MEMORY_SYSTEM)
                return TTM_PL_SYSTEM;
 
+       if (mem->type == INTEL_MEMORY_STOLEN_SYSTEM ||
+           mem->type == INTEL_MEMORY_STOLEN_LOCAL)
+               return TTM_PL_VRAM;
+
        type = mem->instance + TTM_PL_PRIV;
        GEM_BUG_ON(type >= TTM_NUM_MEM_TYPES);
 
@@ -85,10 +91,16 @@ int intel_region_ttm_init(struct intel_memory_region *mem)
        int mem_type = intel_region_to_ttm_type(mem);
        int ret;
 
-       ret = i915_ttm_buddy_man_init(bdev, mem_type, false,
-                                     resource_size(&mem->region),
-                                     mem->io_size,
-                                     mem->min_page_size, PAGE_SIZE);
+       if (mem_type == TTM_PL_VRAM) {
+               ret = ttm_range_man_init(bdev, mem_type, false,
+                                        resource_size(&mem->region) >> 
PAGE_SHIFT);
+               mem->is_range_manager = true;
+       } else {
+               ret = i915_ttm_buddy_man_init(bdev, mem_type, false,
+                                             resource_size(&mem->region),
+                                             mem->io_size,
+                                             mem->min_page_size, PAGE_SIZE);
+       }
        if (ret)
                return ret;
 
@@ -108,6 +120,7 @@ int intel_region_ttm_init(struct intel_memory_region *mem)
 int intel_region_ttm_fini(struct intel_memory_region *mem)
 {
        struct ttm_resource_manager *man = mem->region_private;
+       int mem_type = intel_region_to_ttm_type(mem);
        int ret = -EBUSY;
        int count;
 
@@ -138,8 +151,10 @@ int intel_region_ttm_fini(struct intel_memory_region *mem)
        if (ret || !man)
                return ret;
 
-       ret = i915_ttm_buddy_man_fini(&mem->i915->bdev,
-                                     intel_region_to_ttm_type(mem));
+       if (mem_type == TTM_PL_VRAM)
+               ret = ttm_range_man_fini(&mem->i915->bdev, mem_type);
+       else
+               ret = i915_ttm_buddy_man_fini(&mem->i915->bdev, mem_type);
        GEM_WARN_ON(ret);
        mem->region_private = NULL;
 
-- 
2.25.1