Skip to contentSkip to conversation

drm/i915: Show pin mapped status in describe_obj

PATCH In review Tvrtko Ursulin 2 participants 5 messages Apr 15, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 drm/i915: Show pin mapped status in describe_obj

From: Tvrtko Ursulin <[email protected]>

Reflect the status of obj->mapping as added with the i915_gem_object_pin_map API.

'M' was chosen to designate the pin mapped status.

---
 drivers/gpu/drm/i915/i915_debugfs.c | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +21 -13
index 46cc03b60183..9302a6961d04 100644
@@ -89,27 +89,34 @@ static int i915_capabilities(struct seq_file *m, void *data)
 	return 0;
 }
 
-static const char *get_pin_flag(struct drm_i915_gem_object *obj)
+static const char get_active_flag(struct drm_i915_gem_object *obj)
 {
-	if (obj->pin_display)
-		return "p";
-	else
-		return " ";
+	return obj->active ? '*' : ' ';
+}
+
+static const char get_pin_flag(struct drm_i915_gem_object *obj)
+{
+	return obj->pin_display ? 'p' : ' ';
 }
 
-static const char *get_tiling_flag(struct drm_i915_gem_object *obj)
+static const char get_tiling_flag(struct drm_i915_gem_object *obj)
 {
 	switch (obj->tiling_mode) {
 	default:
-	case I915_TILING_NONE: return " ";
-	case I915_TILING_X: return "X";
-	case I915_TILING_Y: return "Y";
+	case I915_TILING_NONE: return ' ';
+	case I915_TILING_X: return 'X';
+	case I915_TILING_Y: return 'Y';
 	}
 }
 
-static inline const char *get_global_flag(struct drm_i915_gem_object *obj)
+static inline const char get_global_flag(struct drm_i915_gem_object *obj)
+{
+	return i915_gem_obj_to_ggtt(obj) ? 'g' : ' ';
+}
+
+static inline const char get_pin_mapped_flag(struct drm_i915_gem_object *obj)
 {
-	return i915_gem_obj_to_ggtt(obj) ? "g" : " ";
+	return obj->mapping ? 'M' : ' ';
 }
 
 static u64 i915_gem_obj_total_ggtt_size(struct drm_i915_gem_object *obj)
@@ -136,12 +143,13 @@ describe_obj(struct seq_file *m, struct drm_i915_gem_object *obj)
 
 	lockdep_assert_held(&obj->base.dev->struct_mutex);
 
-	seq_printf(m, "%pK: %s%s%s%s %8zdKiB %02x %02x [ ",
+	seq_printf(m, "%pK: %c%c%c%c%c %8zdKiB %02x %02x [ ",
 		   &obj->base,
-		   obj->active ? "*" : " ",
+		   get_active_flag(obj),
 		   get_pin_flag(obj),
 		   get_tiling_flag(obj),
 		   get_global_flag(obj),
+		   get_pin_mapped_flag(obj),
 		   obj->base.size / 1024,
 		   obj->base.read_domains,
 		   obj->base.write_domain);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 2/2 drm/i915: Show pin mapped counts and sizes in debugfs

From: Tvrtko Ursulin <[email protected]>

Show a total and purgeable number of pin mapped objects and their total and purgeable size.

Example output (new stat prefixed with a star):

  # cat i915_gem_objects
  19920 objects, 289243136 bytes
  19920 [18466] objects, 288714752 [267911168] bytes in gtt
    0 [0] active objects, 0 [0] bytes
    19917 [18466] inactive objects, 288714752 [267911168] bytes
  0 unbound objects, 0 bytes
  0 purgeable objects, 0 bytes
  1 pinned mappable objects, 3145728 bytes
  0 fault mappable objects, 0 bytes
* 19914 [0] pin mapped objects, 285560832 [0] bytes [purgeable]
  4294967296 [268435456] gtt total
---
 drivers/gpu/drm/i915/i915_debugfs.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
drivers/gpu/drm/i915/i915_debugfs.c +22 -0
index 9302a6961d04..58e2f48b4fd7 100644
@@ -443,6 +443,8 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
 	struct i915_ggtt *ggtt = &dev_priv->ggtt;
 	u32 count, mappable_count, purgeable_count;
 	u64 size, mappable_size, purgeable_size;
+	unsigned long pin_mapped_count = 0, pin_mapped_purgeable_count = 0;
+	u64 pin_mapped_size = 0, pin_mapped_purgeable_size = 0;
 	struct drm_i915_gem_object *obj;
 	struct drm_file *file;
 	struct i915_vma *vma;
@@ -476,6 +478,14 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
 		size += obj->base.size, ++count;
 		if (obj->madv == I915_MADV_DONTNEED)
 			purgeable_size += obj->base.size, ++purgeable_count;
+		if (obj->mapping) {
+			pin_mapped_count++;
+			pin_mapped_size += obj->base.size;
+			if (obj->pages_pin_count == 0) {
+				pin_mapped_purgeable_count++;
+				pin_mapped_purgeable_size += obj->base.size;
+			}
+		}
 	}
 	seq_printf(m, "%u unbound objects, %llu bytes\n", count, size);
 
@@ -493,6 +503,14 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
 			purgeable_size += obj->base.size;
 			++purgeable_count;
 		}
+		if (obj->mapping) {
+			pin_mapped_count++;
+			pin_mapped_size += obj->base.size;
+			if (obj->pages_pin_count == 0) {
+				pin_mapped_purgeable_count++;
+				pin_mapped_purgeable_size += obj->base.size;
+			}
+		}
 	}
 	seq_printf(m, "%u purgeable objects, %llu bytes\n",
 		   purgeable_count, purgeable_size);
@@ -500,6 +518,10 @@ static int i915_gem_object_info(struct seq_file *m, void* data)
 		   mappable_count, mappable_size);
 	seq_printf(m, "%u fault mappable objects, %llu bytes\n",
 		   count, size);
+	seq_printf(m,
+		   "%lu [%lu] pin mapped objects, %llu [%llu] bytes [purgeable]\n",
+		   pin_mapped_count, pin_mapped_purgeable_count,
+		   pin_mapped_size, pin_mapped_purgeable_size);
 
 	seq_printf(m, "%llu [%llu] gtt total\n",
 		   ggtt->base.total, ggtt->mappable_end - ggtt->base.start);
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

✗ Fi.CI.BAT: failure for series starting with [resend-for-CI,1/2] drm/i915: Show pin mapped status in describe_obj

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: series starting with [resend-for-CI,1/2] drm/i915: Show pin mapped status in describe_obj
URL : https://patchwork.freedesktop.org/series/5771/
State : failure

== Summary ==

Series 5771v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/5771/revisions/1/mbox/

bdw-ultra        total:203  pass:179  dwarn:0   dfail:0   fail:1   skip:23 
bsw-nuc-2        total:202  pass:162  dwarn:0   dfail:0   fail:1   skip:39 
byt-nuc          total:202  pass:163  dwarn:0   dfail:0   fail:1   skip:38 
hsw-brixbox      total:203  pass:178  dwarn:0   dfail:0   fail:1   skip:24 
hsw-gt2          total:203  pass:183  dwarn:0   dfail:0   fail:1   skip:19 
ilk-hp8440p      total:203  pass:134  dwarn:0   dfail:0   fail:1   skip:68 
ivb-t430s        total:203  pass:174  dwarn:0   dfail:0   fail:1   skip:28 
skl-i7k-2        total:203  pass:177  dwarn:0   dfail:0   fail:1   skip:25 
skl-nuci5        total:203  pass:191  dwarn:0   dfail:0   fail:1   skip:11 
snb-dellxps      total:203  pass:164  dwarn:0   dfail:0   fail:1   skip:38 
snb-x220t        total:203  pass:164  dwarn:0   dfail:0   fail:2   skip:37 

BOOT FAILED for bdw-nuci7

Results at /archive/results/CI_IGT_test/Patchwork_1912/

93007879016173240c35d81572d1fec8c8376f07 drm-intel-nightly: 2016y-04m-15d-07h-43m-11s UTC integration manifest 4f28eb9 drm/i915: Show pin mapped counts and sizes in debugfs
14cd74b drm/i915: Show pin mapped status in describe_obj

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#3 lore raw

✓ Fi.CI.BAT: success for series starting with [resend-for-CI,1/2] drm/i915: Show pin mapped status in describe_obj

In reply to Tvrtko Ursulin
== Series Details ==

== Series Details ==

Series: series starting with [resend-for-CI,1/2] drm/i915: Show pin mapped status in describe_obj
URL : https://patchwork.freedesktop.org/series/5771/
State : success

== Summary ==

Series 5771v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/5771/revisions/1/mbox/

bdw-nuci7        total:203  pass:191  dwarn:0   dfail:0   fail:0   skip:12 
bdw-ultra        total:203  pass:179  dwarn:0   dfail:0   fail:1   skip:23 
bsw-nuc-2        total:202  pass:162  dwarn:0   dfail:0   fail:1   skip:39 
byt-nuc          total:202  pass:163  dwarn:0   dfail:0   fail:1   skip:38 
hsw-brixbox      total:203  pass:178  dwarn:0   dfail:0   fail:1   skip:24 
hsw-gt2          total:203  pass:183  dwarn:0   dfail:0   fail:1   skip:19 
ilk-hp8440p      total:203  pass:134  dwarn:0   dfail:0   fail:1   skip:68 
ivb-t430s        total:203  pass:174  dwarn:0   dfail:0   fail:1   skip:28 
skl-i7k-2        total:203  pass:177  dwarn:0   dfail:0   fail:1   skip:25 
skl-nuci5        total:203  pass:191  dwarn:0   dfail:0   fail:1   skip:11 
snb-dellxps      total:203  pass:164  dwarn:0   dfail:0   fail:1   skip:38 
snb-x220t        total:203  pass:164  dwarn:0   dfail:0   fail:2   skip:37 

Results at /archive/results/CI_IGT_test/Patchwork_1912/

93007879016173240c35d81572d1fec8c8376f07 drm-intel-nightly: 2016y-04m-15d-07h-43m-11s UTC integration manifest 4f28eb9 drm/i915: Show pin mapped counts and sizes in debugfs
14cd74b drm/i915: Show pin mapped status in describe_obj

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

Re: ✓ Fi.CI.BAT: success for series starting with [resend-for-CI,1/2] drm/i915: Show pin mapped status in describe_obj

Quoted 25 lines · Patchwork

== Series Details ==

Series: series starting with [resend-for-CI,1/2] drm/i915: Show pin mapped status in describe_obj
URL : https://patchwork.freedesktop.org/series/5771/
State : success

== Summary ==

Series 5771v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/5771/revisions/1/mbox/

bdw-nuci7        total:203  pass:191  dwarn:0   dfail:0   fail:0   skip:12
bdw-ultra        total:203  pass:179  dwarn:0   dfail:0   fail:1   skip:23
bsw-nuc-2        total:202  pass:162  dwarn:0   dfail:0   fail:1   skip:39
byt-nuc          total:202  pass:163  dwarn:0   dfail:0   fail:1   skip:38
hsw-brixbox      total:203  pass:178  dwarn:0   dfail:0   fail:1   skip:24
hsw-gt2          total:203  pass:183  dwarn:0   dfail:0   fail:1   skip:19
ilk-hp8440p      total:203  pass:134  dwarn:0   dfail:0   fail:1   skip:68
ivb-t430s        total:203  pass:174  dwarn:0   dfail:0   fail:1   skip:28
skl-i7k-2        total:203  pass:177  dwarn:0   dfail:0   fail:1   skip:25
skl-nuci5        total:203  pass:191  dwarn:0   dfail:0   fail:1   skip:11
snb-dellxps      total:203  pass:164  dwarn:0   dfail:0   fail:1   skip:38
snb-x220t        total:203  pass:164  dwarn:0   dfail:0   fail:2   skip:37
Quoted 5 lines

Results at /archive/results/CI_IGT_test/Patchwork_1912/

93007879016173240c35d81572d1fec8c8376f07 drm-intel-nightly: 2016y-04m-15d-07h-43m-11s UTC integration manifest 4f28eb9 drm/i915: Show pin mapped counts and sizes in debugfs
14cd74b drm/i915: Show pin mapped status in describe_obj

Series merged - thanks for the review!

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx