summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Gordon <david.s.gordon@intel.com>2015-09-16 08:41:38 +0100
committerJohn Harrison <John.C.Harrison@Intel.com>2016-06-28 17:19:13 +0100
commit1fb583a345e9d1b2b337e68f1f5b5ec445502d3c (patch)
tree3aa78f8233db598ca9b6e4c9efef95d399ac7c4c
parent2708d0d3ce2bec0cd55cdd5f11babf5931b7d49f (diff)
drm/i915/error: report size in pages for each object dumped
For: VIZ-2021 Signed-off-by: Dave Gordon <david.s.gordon@intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_gpu_error.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index 276814764d99..e7ee47993e9f 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -493,17 +493,19 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
err_printf(m, " (submitted by %s [%d])",
error->ring[i].comm,
error->ring[i].pid);
- err_printf(m, " --- gtt_offset = 0x%08x %08x\n",
+ err_printf(m, " --- gtt_offset = 0x%08x %08x; %d pages\n",
upper_32_bits(obj->gtt_offset),
- lower_32_bits(obj->gtt_offset));
+ lower_32_bits(obj->gtt_offset),
+ obj->page_count);
print_error_obj(m, obj);
}
obj = error->ring[i].wa_batchbuffer;
if (obj) {
- err_printf(m, "%s (w/a) --- gtt_offset = 0x%08x\n",
+ err_printf(m, "%s (w/a) --- gtt_offset = 0x%08x; %d pages\n",
dev_priv->engine[i].name,
- lower_32_bits(obj->gtt_offset));
+ lower_32_bits(obj->gtt_offset),
+ obj->page_count);
print_error_obj(m, obj);
}
@@ -524,18 +526,20 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
}
if ((obj = error->ring[i].req_ringbuffer)) {
- err_printf(m, "%s --- ringbuffer = 0x%08x (ctx_desc 0x%08x_%08x)\n",
+ err_printf(m, "%s --- ringbuffer = 0x%08x; %d pages (ctx_desc 0x%08x_%08x)\n",
dev_priv->engine[i].name,
lower_32_bits(obj->gtt_offset),
+ obj->page_count,
upper_32_bits(error->ring[i].ctx_desc),
lower_32_bits(error->ring[i].ctx_desc));
print_error_obj(m, obj);
}
if ((obj = error->ring[i].hw_ringbuffer)) {
- err_printf(m, "%s --- HW ringbuffer = 0x%08x\n",
+ err_printf(m, "%s --- HW ringbuffer = 0x%08x; %d pages\n",
dev_priv->engine[i].name,
- lower_32_bits(obj->gtt_offset));
+ lower_32_bits(obj->gtt_offset),
+ obj->page_count);
print_error_obj(m, obj);
}
@@ -584,9 +588,10 @@ int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
}
if ((obj = error->ring[i].ctx)) {
- err_printf(m, "%s --- HW Context = 0x%08x\n",
+ err_printf(m, "%s --- HW Context = 0x%08x; %d pages\n",
dev_priv->engine[i].name,
- lower_32_bits(obj->gtt_offset));
+ lower_32_bits(obj->gtt_offset),
+ obj->page_count);
print_error_obj(m, obj);
}
}