drm/i915/lmem: debugfs for LMEM details

Debugfs i915_gem_object is extended to enable the IGTs to
detect the LMEM's availability and the total size of LMEM.

v2: READ_ONCE is used [Chris]
v3: %pa is used for printing the resource [Chris]
v4: All regions' details added to debugfs [Chris]
v5: Macro for_each_mem_region added
    name is initialized at region init [Chris]

Signed-off-by: Lukasz Fiedorowicz <lukasz.fiedorowicz@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Stuart Summers <stuart.summers@intel.com>
Signed-off-by: Ramalingam C <ramalingam.c@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/20191227133748.4330-1-ramalingam.c@intel.com

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
index 4d69c3fc3439e9c8abe7b9a69779ed8eef16a6a8..a2a980d9d24132d3d00976c1a71584ad43d63f23 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shmem.c
@@ -594,6 +594,8 @@ static int init_shmem(struct intel_memory_region *mem)
                         err);
        }
 
+       intel_memory_region_set_name(mem, "system");
+
        return 0; /* Don't error, we can simply fallback to the kernel mnt */
 }
 

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
index afb08a1704a2f44f9d92196a800dbef06198dac4..451f3078d60d8b6cd3916913ae316a9c1dbddf3a 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_stolen.c
@@ -645,6 +645,8 @@ i915_gem_object_create_stolen(struct drm_i915_private *i915,
 
 static int init_stolen(struct intel_memory_region *mem)
 {
+       intel_memory_region_set_name(mem, "stolen");
+
        /*
         * Initialise stolen early so that we may reserve preallocated
         * objects for the BIOS to KMS transition.

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index d28468eaed577e952aeeaeb62c1da7fbf1907375..8ece0d7dfc93738518e2d7fdd52b3a5a154fef43 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -367,12 +367,16 @@ static void print_context_stats(struct seq_file *m,
 static int i915_gem_object_info(struct seq_file *m, void *data)
 {
        struct drm_i915_private *i915 = node_to_i915(m->private);
+       struct intel_memory_region *mr;
+       enum intel_region_id id;
 
        seq_printf(m, "%u shrinkable [%u free] objects, %llu bytes\n",
                   i915->mm.shrink_count,
                   atomic_read(&i915->mm.free_count),
                   i915->mm.shrink_memory);
-
+       for_each_memory_region(mr, i915, id)
+               seq_printf(m, "%s: total:%pa, available:%pa bytes\n",
+                          mr->name, &mr->total, &mr->avail);
        seq_putc(m, '\n');
 
        print_context_stats(m, i915);

diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
index e24c280e5930df6905d3124e992a4085e45b60ec..a6211cbec71ef966aba0b77f6d4a804aea48f834 100644 (file)
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -37,7 +37,7 @@ __intel_memory_region_put_pages_buddy(struct intel_memory_region *mem,
                                      struct list_head *blocks)
 {
        mutex_lock(&mem->mm_lock);
-       intel_memory_region_free_pages(mem, blocks);
+       mem->avail += intel_memory_region_free_pages(mem, blocks);
        mutex_unlock(&mem->mm_lock);
 }
 
@@ -106,6 +106,7 @@ __intel_memory_region_get_pages_buddy(struct intel_memory_region *mem,
                        break;
        } while (1);
 
+       mem->avail -= size;
        mutex_unlock(&mem->mm_lock);
        return 0;
 
@@ -164,6 +165,8 @@ intel_memory_region_create(struct drm_i915_private *i915,
        mem->io_start = io_start;
        mem->min_page_size = min_page_size;
        mem->ops = ops;
+       mem->total = size;
+       mem->avail = mem->total;
 
        mutex_init(&mem->objects.lock);
        INIT_LIST_HEAD(&mem->objects.list);
@@ -185,6 +188,16 @@ err_free:
        return ERR_PTR(err);
 }
 
+void intel_memory_region_set_name(struct intel_memory_region *mem,
+                                 const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       vsnprintf(mem->name, sizeof(mem->name), fmt, ap);
+       va_end(ap);
+}
+
 static void __intel_memory_region_destroy(struct kref *kref)
 {
        struct intel_memory_region *mem =

diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 23872200967700ceaf828e97681ae3e2fd7d53ae..7f4bff8f8be1bd4b2bcb0f7c2982f063725506e9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -47,6 +47,10 @@ enum intel_region_id {
 #define I915_ALLOC_MIN_PAGE_SIZE  BIT(0)
 #define I915_ALLOC_CONTIGUOUS     BIT(1)
 
+#define for_each_memory_region(mr, i915, id) \
+       for (id = 0; id < ARRAY_SIZE((i915)->mm.regions); id++) \
+               for_each_if((mr) = (i915)->mm.regions[id])
+
 /**
  * Memory regions encoded as type | instance
  */
@@ -82,10 +86,13 @@ struct intel_memory_region {
 
        resource_size_t io_start;
        resource_size_t min_page_size;
+       resource_size_t total;
+       resource_size_t avail;
 
        unsigned int type;
        unsigned int instance;
        unsigned int id;
+       char name[8];
 
        dma_addr_t remap_addr;
 
@@ -126,4 +133,8 @@ void intel_memory_region_put(struct intel_memory_region *mem);
 int intel_memory_regions_hw_probe(struct drm_i915_private *i915);
 void intel_memory_regions_driver_release(struct drm_i915_private *i915);
 
+__printf(2, 3) void
+intel_memory_region_set_name(struct intel_memory_region *mem,
+                            const char *fmt, ...);
+
 #endif

diff --git a/drivers/gpu/drm/i915/intel_region_lmem.c b/drivers/gpu/drm/i915/intel_region_lmem.c
index eddb392917aa50a12a83f38979d2ec841b264d22..e6a6b571dad43174fe287f84e36bd44178210889 100644 (file)
--- a/drivers/gpu/drm/i915/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/intel_region_lmem.c
@@ -90,6 +90,8 @@ region_lmem_init(struct intel_memory_region *mem)
        if (ret)
                io_mapping_fini(&mem->iomap);
 
+       intel_memory_region_set_name(mem, "local");
+
        return ret;
 }