[v2,6/9] drm/i915/error: enhanced error capture of requests

Commit Message

[e-mail] Feb. 10, 2016, 3:50 p.m. UTC

From: Dave Gordon <[e-mail]>

Record a few more things about the requests outstanding at the time of
capture ...

For: VIZ-2021
Signed-off-by: Dave Gordon <[e-mail]>
Signed-off-by: Arun Siluvery <[e-mail]>
---
 drivers/gpu/drm/i915/i915_drv.h       |  6 +++++-
 drivers/gpu/drm/i915/i915_gpu_error.c | 23 +++++++++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

Patch

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 549478f..ed991bf 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -564,8 +564,9 @@  struct drm_i915_error_state {
 		u64 ctx_desc;
 
 		struct drm_i915_error_object {
-			int page_count;
 			u64 gtt_offset;
+			bool is_ppgtt;
+			int page_count;
 			u32 *pages[0];
 		} *req_ringbuffer, *hw_ringbuffer, *batchbuffer, *wa_batchbuffer, *ctx, *hws_page;
 
@@ -573,7 +574,10 @@  struct drm_i915_error_state {
 			u64 ctx_desc;
 			long jiffies;
 			u32 seqno;
+			u32 head;
 			u32 tail;
+			u32 submission_count;
+			u64 ringbuffer_gtt;
 		} *requests;
 
 		struct {
diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
index c599df6..03485ca 100644
--- a/drivers/gpu/drm/i915/i915_gpu_error.c
+++ b/drivers/gpu/drm/i915/i915_gpu_error.c
@@ -493,9 +493,11 @@  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, " --- %sgtt_offset = 0x%08x %08x; %d pages\n",
+				   obj->is_ppgtt ? "pp" : "g",
 				   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);
 		}
 
@@ -514,9 +516,13 @@  int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
 			for (j = 0; j < error->ring[i].num_requests; j++) {
 				struct drm_i915_error_request *erq;
 				erq = &error->ring[i].requests[j];
-				err_printf(m, "  seqno 0x%08x, tail 0x%08x, "
-					"emitted %ld, ctx_desc 0x%08x_%08x\n",
-					erq->seqno, erq->tail, erq->jiffies,
+				err_printf(m, "  seqno 0x%08x, ringbuf 0x%llx "
+					      "head 0x%08x tail 0x%08x, "
+					      "emitted %ld, %d submissions, "
+					      "ctx_desc 0x%08x_%08x\n",
+					erq->seqno, erq->ringbuffer_gtt,
+					erq->head, erq->tail,
+					erq->jiffies, erq->submission_count,
 					upper_32_bits(erq->ctx_desc),
 					lower_32_bits(erq->ctx_desc));
 			}
@@ -698,6 +704,8 @@  i915_error_object_create(struct drm_i915_private *dev_priv,
 	reloc_offset = dst->gtt_offset;
 	if (i915_is_ggtt(vm))
 		vma = i915_gem_obj_to_ggtt(src);
+	else
+		dst->is_ppgtt = true;
 	use_ggtt = (src->cache_level == I915_CACHE_NONE &&
 		   vma && (vma->bound & GLOBAL_BIND) &&
 		   reloc_offset + num_pages * PAGE_SIZE <= dev_priv->gtt.mappable_end);
@@ -1209,7 +1217,10 @@  static void i915_gem_record_rings(struct drm_device *dev,
 			erq->ctx_desc = intel_lr_context_descriptor(ctx, ring);
 			erq->jiffies = request->emitted_jiffies;
 			erq->seqno = request->seqno;
-			erq->tail = request->postfix;
+			erq->tail = request->tail;
+			erq->head = request->head;
+			erq->submission_count = request->elsp_submitted;
+			erq->ringbuffer_gtt = i915_gem_obj_ggtt_offset(request->ringbuf->obj);
 		}
 	}
 }