drm/i915: enumerate and init each supported region

Nothing to enumerate yet...

Signed-off-by: Abdiel Janulgue <abdiel.janulgue@linux.intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20191018090751.28295-1-matthew.auld@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 40e923b0c2c8285df892b5313972f9fc43f5335c..faf6458027105aa09c43086c2e9421e205798537 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -684,6 +684,8 @@ struct i915_gem_mm {
         */
        struct vfsmount *gemfs;
 
+       struct intel_memory_region *regions[INTEL_REGION_UNKNOWN];
+
        struct notifier_block oom_notifier;
        struct notifier_block vmap_notifier;
        struct shrinker shrinker;
@@ -1783,6 +1785,8 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 
 #define HAS_IPC(dev_priv)               (INTEL_INFO(dev_priv)->display.has_ipc)
 
+#define HAS_REGION(i915, i) (INTEL_INFO(i915)->memory_regions & (i))
+
 #define HAS_GT_UC(dev_priv)    (INTEL_INFO(dev_priv)->has_gt_uc)
 
 /* Having GuC is not the same as using GuC */
@@ -2001,6 +2005,9 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,
                                         unsigned int flags);
 int i915_gem_evict_vm(struct i915_address_space *vm);
 
+void i915_gem_cleanup_memory_regions(struct drm_i915_private *i915);
+int i915_gem_init_memory_regions(struct drm_i915_private *i915);
+
 /* i915_gem_internal.c */
 struct drm_i915_gem_object *
 i915_gem_object_create_internal(struct drm_i915_private *dev_priv,

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 7b15bb8919702dca98ebef2751b076ee48c7aa29..7b8e30c72f863a45a1cd0c18fd3a66b298fcc4e4 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -2744,6 +2744,52 @@ int i915_init_ggtt(struct drm_i915_private *i915)
        return 0;
 }
 
+void i915_gem_cleanup_memory_regions(struct drm_i915_private *i915)
+{
+       int i;
+
+       i915_gem_cleanup_stolen(i915);
+
+       for (i = 0; i < INTEL_REGION_UNKNOWN; i++) {
+               struct intel_memory_region *region = i915->mm.regions[i];
+
+               if (region)
+                       intel_memory_region_put(region);
+       }
+}
+
+int i915_gem_init_memory_regions(struct drm_i915_private *i915)
+{
+       int err, i;
+
+       /*
+        * Initialise stolen early so that we may reserve preallocated
+        * objects for the BIOS to KMS transition.
+        */
+       /* XXX: stolen will become a region at some point */
+       err = i915_gem_init_stolen(i915);
+       if (err)
+               return err;
+
+       for (i = 0; i < INTEL_REGION_UNKNOWN; i++) {
+               struct intel_memory_region *mem = ERR_PTR(-ENODEV);
+
+               if (!HAS_REGION(i915, BIT(i)))
+                       continue;
+
+               if (IS_ERR(mem)) {
+                       err = PTR_ERR(mem);
+                       goto out_cleanup;
+               }
+       }
+
+       return 0;
+
+out_cleanup:
+       i915_gem_cleanup_memory_regions(i915);
+       return err;
+}
+
 static void ggtt_cleanup_hw(struct i915_ggtt *ggtt)
 {
        struct i915_vma *vma, *vn;
@@ -2781,6 +2827,8 @@ void i915_ggtt_driver_release(struct drm_i915_private *i915)
 {
        struct pagevec *pvec;
 
+       i915_gem_cleanup_memory_regions(i915);
+
        fini_aliasing_ppgtt(&i915->ggtt);
 
        ggtt_cleanup_hw(&i915->ggtt);
@@ -2790,8 +2838,6 @@ void i915_ggtt_driver_release(struct drm_i915_private *i915)
                set_pages_array_wb(pvec->pages, pvec->nr);
                __pagevec_release(pvec);
        }
-
-       i915_gem_cleanup_stolen(i915);
 }
 
 static unsigned int gen6_get_total_gtt_size(u16 snb_gmch_ctl)
@@ -3240,11 +3286,7 @@ int i915_ggtt_init_hw(struct drm_i915_private *dev_priv)
        if (ret)
                return ret;
 
-       /*
-        * Initialise stolen early so that we may reserve preallocated
-        * objects for the BIOS to KMS transition.
-        */
-       ret = i915_gem_init_stolen(dev_priv);
+       ret = i915_gem_init_memory_regions(dev_priv);
        if (ret)
                goto out_gtt_cleanup;
 

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 0cdc2465534b568718ef9bb324a13d24c01ad2c4..e9940f932d26f7726db2f37f9431fad4a9a413f4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -160,6 +160,8 @@ struct intel_device_info {
 
        unsigned int page_sizes; /* page sizes supported by the HW */
 
+       u32 memory_regions; /* regions supported by the HW */
+
        u32 display_mmio_offset;
 
        u8 pipe_mask;

diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 52c141b6108c7110e47be43b475332422bbbb566..2c165a7a5ab4aab6fa8fba8113ccf67893215735 100644 (file)
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -18,6 +18,10 @@ struct drm_i915_gem_object;
 struct intel_memory_region;
 struct sg_table;
 
+enum intel_region_id {
+       INTEL_REGION_UNKNOWN = 0, /* Should be last */
+};
+
 #define I915_ALLOC_MIN_PAGE_SIZE  BIT(0)
 #define I915_ALLOC_CONTIGUOUS     BIT(1)
 

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 9c22d41b30cdc3b7ce0a5903e942e1ee2d56cbcf..bc5e3c67409fcf62af85e74986edc94a0318fbec 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -74,6 +74,8 @@ static void mock_device_release(struct drm_device *dev)
 
        i915_gemfs_fini(i915);
 
+       i915_gem_cleanup_memory_regions(i915);
+
        drm_mode_config_cleanup(&i915->drm);
 
        drm_dev_fini(&i915->drm);
@@ -196,6 +198,10 @@ struct drm_i915_private *mock_gem_device(void)
 
        WARN_ON(i915_gemfs_init(i915));
 
+       err = i915_gem_init_memory_regions(i915);
+       if (err)
+               goto err_context;
+
        return i915;
 
 err_context: