From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 6/7] drm/i915: Add stable memory region names
Date: Wed, 27 Sep 2023 14:38:42 +0100 [thread overview]
Message-ID: <20230927133843.247957-7-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20230927133843.247957-1-tvrtko.ursulin@linux.intel.com>
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
At the moment memory region names are a bit too varied and too
inconsistent to be used for ABI purposes, like for upcoming fdinfo
memory stats.
System memory can be either system or system-ttm. Local memory has the
instance number appended, others do not. Not only incosistent but thi
kind of implementation detail is uninteresting for intended users of
fdinfo memory stats.
Add a stable name always formed as $type$instance. Could have chosen a
different stable scheme, but I think any consistent and stable scheme
should do just fine.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Aravind Iddamsetty <aravind.iddamsetty@intel.com>
---
drivers/gpu/drm/i915/intel_memory_region.c | 19 +++++++++++++++++++
drivers/gpu/drm/i915/intel_memory_region.h | 1 +
2 files changed, 20 insertions(+)
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
index 3d1fdea9811d..60a03340bbd4 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -216,6 +216,22 @@ static int intel_memory_region_memtest(struct intel_memory_region *mem,
return err;
}
+static const char *region_type_str(u16 type)
+{
+ switch (type) {
+ case INTEL_MEMORY_SYSTEM:
+ return "system";
+ case INTEL_MEMORY_LOCAL:
+ return "local";
+ case INTEL_MEMORY_STOLEN_LOCAL:
+ return "stolen-local";
+ case INTEL_MEMORY_STOLEN_SYSTEM:
+ return "stolen-system";
+ default:
+ return "unknown";
+ }
+}
+
struct intel_memory_region *
intel_memory_region_create(struct drm_i915_private *i915,
resource_size_t start,
@@ -244,6 +260,9 @@ intel_memory_region_create(struct drm_i915_private *i915,
mem->type = type;
mem->instance = instance;
+ snprintf(mem->uabi_name, sizeof(mem->uabi_name), "%s%u",
+ region_type_str(type), instance);
+
mutex_init(&mem->objects.lock);
INIT_LIST_HEAD(&mem->objects.list);
diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 2953ed5c3248..9ba36454e51b 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -80,6 +80,7 @@ struct intel_memory_region {
u16 instance;
enum intel_region_id id;
char name[16];
+ char uabi_name[16];
bool private; /* not for userspace */
struct {
--
2.39.2
next prev parent reply other threads:[~2023-09-27 13:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 13:38 [Intel-gfx] [PATCH v8 0/7] fdinfo memory stats Tvrtko Ursulin
2023-09-27 13:38 ` [Intel-gfx] [PATCH 1/7] drm: Do not round to megabytes for greater than 1MiB sizes in fdinfo stats Tvrtko Ursulin
2023-09-27 13:48 ` Steven Price
2023-09-28 12:47 ` Tvrtko Ursulin
2023-10-26 14:43 ` Tvrtko Ursulin
2023-11-02 9:50 ` Tvrtko Ursulin
2023-11-06 10:45 ` [Intel-gfx] (subset) " Maxime Ripard
2023-09-27 13:38 ` [Intel-gfx] [PATCH 2/7] drm/i915: Add ability for tracking buffer objects per client Tvrtko Ursulin
2023-09-27 13:38 ` [Intel-gfx] [PATCH 3/7] drm/i915: Record which client owns a VM Tvrtko Ursulin
2023-09-27 13:38 ` [Intel-gfx] [PATCH 4/7] drm/i915: Track page table backing store usage Tvrtko Ursulin
2023-09-27 13:38 ` [Intel-gfx] [PATCH 5/7] drm/i915: Account ring buffer and context state storage Tvrtko Ursulin
2023-09-27 13:38 ` Tvrtko Ursulin [this message]
2023-09-27 13:38 ` [Intel-gfx] [PATCH 7/7] drm/i915: Implement fdinfo memory stats printing Tvrtko Ursulin
2023-09-27 20:30 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for fdinfo memory stats (rev9) Patchwork
2023-09-27 20:43 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-09-28 10:44 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927133843.247957-7-tvrtko.ursulin@linux.intel.com \
--to=tvrtko.ursulin@linux.intel.com \
--cc=Intel-gfx@lists.freedesktop.org \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox