drm/i915/lmem: debugfs for LMEM details (38f1cb68) · Commits · 戴 / test

drivers/gpu/drm/i915/gem/i915_gem_shmem.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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 */
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -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.

+5 −1

Original line number	Diff line number	Diff line
		@@ -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);

+14 −1

Original line number	Diff line number	Diff line
		@@ -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 =

+11 −0

Original line number	Diff line number	Diff line
		@@ -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