Commit 8c3363c6 authored by Matthew Auld's avatar Matthew Auld

drm/i915/debugfs: hook up ttm_resource_manager_debug

This should give a more complete view of the various bits of internal
resource manager state, for device local-memory.

v2(Thomas):
   - Move the region printing into a nice helper
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210819093419.295636-2-matthew.auld@intel.com
parent 5359b745
...@@ -238,6 +238,7 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj) ...@@ -238,6 +238,7 @@ i915_debugfs_describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
static int i915_gem_object_info(struct seq_file *m, void *data) static int i915_gem_object_info(struct seq_file *m, void *data)
{ {
struct drm_i915_private *i915 = node_to_i915(m->private); struct drm_i915_private *i915 = node_to_i915(m->private);
struct drm_printer p = drm_seq_file_printer(m);
struct intel_memory_region *mr; struct intel_memory_region *mr;
enum intel_region_id id; enum intel_region_id id;
...@@ -246,8 +247,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data) ...@@ -246,8 +247,7 @@ static int i915_gem_object_info(struct seq_file *m, void *data)
atomic_read(&i915->mm.free_count), atomic_read(&i915->mm.free_count),
i915->mm.shrink_memory); i915->mm.shrink_memory);
for_each_memory_region(mr, i915, id) for_each_memory_region(mr, i915, id)
seq_printf(m, "%s: total:%pa, available:%pa bytes\n", intel_memory_region_debug(mr, &p);
mr->name, &mr->total, &mr->avail);
return 0; return 0;
} }
......
...@@ -78,6 +78,18 @@ int intel_memory_region_reserve(struct intel_memory_region *mem, ...@@ -78,6 +78,18 @@ int intel_memory_region_reserve(struct intel_memory_region *mem,
return i915_ttm_buddy_man_reserve(man, offset, size); return i915_ttm_buddy_man_reserve(man, offset, size);
} }
void intel_memory_region_debug(struct intel_memory_region *mr,
struct drm_printer *printer)
{
drm_printf(printer, "%s: ", mr->name);
if (mr->region_private)
ttm_resource_manager_debug(mr->region_private, printer);
else
drm_printf(printer, "total:%pa, available:%pa bytes\n",
&mr->total, &mr->avail);
}
struct intel_memory_region * struct intel_memory_region *
intel_memory_region_create(struct drm_i915_private *i915, intel_memory_region_create(struct drm_i915_private *i915,
resource_size_t start, resource_size_t start,
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
struct drm_i915_private; struct drm_i915_private;
struct drm_i915_gem_object; struct drm_i915_gem_object;
struct drm_printer;
struct intel_memory_region; struct intel_memory_region;
struct sg_table; struct sg_table;
struct ttm_resource; struct ttm_resource;
...@@ -127,6 +128,9 @@ int intel_memory_region_reserve(struct intel_memory_region *mem, ...@@ -127,6 +128,9 @@ int intel_memory_region_reserve(struct intel_memory_region *mem,
resource_size_t offset, resource_size_t offset,
resource_size_t size); resource_size_t size);
void intel_memory_region_debug(struct intel_memory_region *mr,
struct drm_printer *printer);
struct intel_memory_region * struct intel_memory_region *
i915_gem_ttm_system_setup(struct drm_i915_private *i915, i915_gem_ttm_system_setup(struct drm_i915_private *i915,
u16 type, u16 instance); u16 type, u16 instance);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment