[PATCH 6/6] eng wa verify

[Tvrtko Ursulin]

From: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
 drivers/gpu/drm/i915/i915_drv.c          |  1 +
 drivers/gpu/drm/i915/i915_gem.c          |  3 +++
 drivers/gpu/drm/i915/intel_workarounds.c | 31 ++++++++++++++++++++++++
 drivers/gpu/drm/i915/intel_workarounds.h |  2 ++
 4 files changed, 37 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 3bd08c5c3869..ac687fa124a4 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2382,6 +2382,7 @@ int i915_reset_engine(struct intel_engine_cs *engine, const char *msg)
 	i915_gem_reset_finish_engine(engine);
 
 	intel_gt_workarounds_verify(engine->i915, engine->name);
+	i915_engine_workarounds_verify(engine, "reset");
 
 	return ret;
 }
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 5e9eaaa652c6..edc9550faef4 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -169,6 +169,9 @@ static u32 __i915_gem_park(struct drm_i915_private *i915)
 	i915_pmu_gt_parked(i915);
 	i915_vma_parked(i915);
 
+	intel_gt_workarounds_verify(i915, "idle");
+	i915_engine_workarounds_verify(i915->engine[RCS], "idle");
+
 	i915->gt.awake = false;
 
 	if (INTEL_GEN(i915) >= 6)
diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index 0d3c582f8eea..a23324948916 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -1331,6 +1331,37 @@ printk(">wa_%s: type=%u reg=%x mask=%x val=%x ---> %x\n",
 			 engine->wa_engine.count, engine->name);
 }
 
+void i915_engine_workarounds_verify(struct intel_engine_cs *engine,
+				    const char *from)
+{
+	struct drm_i915_private *dev_priv = engine->i915;
+	struct i915_engine_wa *reg;
+	unsigned int i;
+
+	if (!engine->wa_engine.count)
+		return;
+
+	for (i = 0, reg = engine->wa_engine.regs;
+	     i < engine->wa_engine.count;
+	     i++, reg++) {
+		u32 val = I915_READ(reg->reg);
+
+		switch (reg->type) {
+		case I915_WA_MASKED:
+			wa_verify_bits(reg->reg, val, 0xffff, reg->val,
+				       from, __func__, false);
+			break;
+		case I915_WA_MASK_AND_OR:
+			wa_verify_bits(reg->reg, val, reg->mask, reg->val,
+				       from, __func__,
+				       reg->mask ? true : false);
+			break;
+		default:
+			MISSING_CASE(reg->type);
+		};
+	}
+}
+
 #if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
 #include "selftests/intel_workarounds.c"
 #endif
diff --git a/drivers/gpu/drm/i915/intel_workarounds.h b/drivers/gpu/drm/i915/intel_workarounds.h
index 19e1d5422c6e..95ebb4f1863f 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.h
+++ b/drivers/gpu/drm/i915/intel_workarounds.h
@@ -36,5 +36,7 @@ void intel_whitelist_workarounds_apply(struct intel_engine_cs *engine);
 
 void i915_engine_workarounds_init(struct intel_engine_cs *engine);
 void i915_engine_workarounds_apply(struct intel_engine_cs *engine);
+void i915_engine_workarounds_verify(struct intel_engine_cs *engine,
+				    const char *from);
 
 #endif
-- 
2.19.1