[PATCH 01/17] drm/i915/selftests: Control group_size for hexdump

[Chris Wilson]

Not everything we hexdump is u32, in particular inspecting relocations
we want to use u64. If we pass through the group_size to hexdump, we can
print out the wider numbers as a single hex so that u64 becomes 0xHILO
instead of the more confusing 0xLO 0xHI.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c | 2 +-
 drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c | 2 +-
 drivers/gpu/drm/i915/gt/selftest_lrc.c                   | 4 ++--
 drivers/gpu/drm/i915/i915_selftest.h                     | 4 +++-
 drivers/gpu/drm/i915/selftests/i915_selftest.c           | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
index 299c29e9ad86..1af75e22d489 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_client_blt.c
@@ -397,7 +397,7 @@ static int verify_buffer(const struct tiled_blits *t,
 		pr_err("Invalid %s tiling detected at (%d, %d), start_val %x\n",
 		       repr_tiling(buf->tiling),
 		       x, y, buf->start_val);
-		igt_hexdump(vaddr, 4096);
+		igt_hexdump_u32(vaddr, 4096);
 	}
 
 	i915_gem_object_unpin_map(buf->vma->obj);
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c
index 57c14d3340cd..16bcecf5b4af 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_execbuffer.c
@@ -87,7 +87,7 @@ static int __igt_gpu_reloc(struct i915_execbuffer *eb,
 		}
 	}
 	if (err)
-		igt_hexdump(map, 4096);
+		igt_hexdump_u64(map, 4096);
 
 put_rq:
 	i915_request_put(rq);
diff --git a/drivers/gpu/drm/i915/gt/selftest_lrc.c b/drivers/gpu/drm/i915/gt/selftest_lrc.c
index daa4aabab9a7..fb9580bf0438 100644
--- a/drivers/gpu/drm/i915/gt/selftest_lrc.c
+++ b/drivers/gpu/drm/i915/gt/selftest_lrc.c
@@ -4856,10 +4856,10 @@ static int live_lrc_layout(void *arg)
 
 		if (err) {
 			pr_info("%s: HW register image:\n", engine->name);
-			igt_hexdump(hw, PAGE_SIZE);
+			igt_hexdump_u32(hw, PAGE_SIZE);
 
 			pr_info("%s: SW register image:\n", engine->name);
-			igt_hexdump(lrc, PAGE_SIZE);
+			igt_hexdump_u32(lrc, PAGE_SIZE);
 		}
 
 		shmem_unpin_map(engine->default_state, hw);
diff --git a/drivers/gpu/drm/i915/i915_selftest.h b/drivers/gpu/drm/i915/i915_selftest.h
index d53d207ab6eb..93548914fb84 100644
--- a/drivers/gpu/drm/i915/i915_selftest.h
+++ b/drivers/gpu/drm/i915/i915_selftest.h
@@ -133,6 +133,8 @@ bool __igt_timeout(unsigned long timeout, const char *fmt, ...);
 #define igt_timeout(t, fmt, ...) \
 	__igt_timeout((t), KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
 
-void igt_hexdump(const void *buf, size_t len);
+void igt_hexdump(const void *buf, size_t len, int group);
+#define igt_hexdump_u32(buf, len) igt_hexdump(buf, len, sizeof(u32))
+#define igt_hexdump_u64(buf, len) igt_hexdump(buf, len, sizeof(u64))
 
 #endif /* !__I915_SELFTEST_H__ */
diff --git a/drivers/gpu/drm/i915/selftests/i915_selftest.c b/drivers/gpu/drm/i915/selftests/i915_selftest.c
index 1bc11c09faef..d6410a02fe65 100644
--- a/drivers/gpu/drm/i915/selftests/i915_selftest.c
+++ b/drivers/gpu/drm/i915/selftests/i915_selftest.c
@@ -396,7 +396,7 @@ bool __igt_timeout(unsigned long timeout, const char *fmt, ...)
 	return true;
 }
 
-void igt_hexdump(const void *buf, size_t len)
+void igt_hexdump(const void *buf, size_t len, int group)
 {
 	const size_t rowsize = 8 * sizeof(u32);
 	const void *prev = NULL;
-- 
2.20.1