[PATCH 12/33] he

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_drv.c  |  1 +
 drivers/gpu/drm/i915/intel_lrc.c | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f5da4b8268f7..64eb5e0a77be 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1950,6 +1950,7 @@ int i915_reset_engine(struct intel_engine_cs *engine)
 		goto out;
 	}
 
+	pr_err("Resetting %s\n", engine->name);
 	ret = intel_gpu_reset(engine->i915, intel_engine_flag(engine));
 	if (ret) {
 		/* If we fail here, we expect to fallback to a global reset */
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index b0738d2b2a7f..c9a991729b45 100644
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -355,6 +355,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine)
 				execlists_context_status_change(rq, INTEL_CONTEXT_SCHEDULE_IN);
 			port_set(&port[n], port_pack(rq, count));
 			desc = execlists_update_context(rq);
+			pr_err("%s: in (rq=%x) ctx=%d\n", engine->name, rq->global_seqno, upper_32_bits(desc));
 			GEM_DEBUG_EXEC(port[n].context_id = upper_32_bits(desc));
 		} else {
 			GEM_BUG_ON(!n);
@@ -594,9 +595,23 @@ static void intel_lrc_irq_handler(unsigned long data)
 			if (!(status & GEN8_CTX_STATUS_COMPLETED_MASK))
 				continue;
 
+			pr_err("%s: out CSB (%x head=%d, tail=%d), ctx=%d, rq=%d\n",
+					engine->name,
+					readl(csb_mmio),
+					head, tail,
+					readl(buf+2*head+1), 
+					port->context_id);
+
 			/* Check the context/desc id for this event matches */
-			GEM_DEBUG_BUG_ON(readl(buf + 2 * head + 1) !=
-					 port->context_id);
+			if (readl(buf + 2 * head + 1) != port->context_id) {
+				pr_err("%s: BUG CSB (%x head=%d, tail=%d), ctx=%d, rq=%d\n",
+						engine->name,
+						readl(csb_mmio),
+						head, tail,
+						readl(buf+2*head+1), 
+						port->context_id);
+				BUG();
+			}
 
 			rq = port_unpack(port, &count);
 			GEM_BUG_ON(count == 0);
-- 
2.13.2