[PATCH 07/10] wa init common

[Tvrtko Ursulin]

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

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
---
 drivers/gpu/drm/i915/intel_workarounds.c | 27 ++++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_workarounds.c b/drivers/gpu/drm/i915/intel_workarounds.c
index f9da9a144167..f8418435ce61 100644
--- a/drivers/gpu/drm/i915/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/intel_workarounds.c
@@ -892,11 +892,23 @@ static void icl_gt_workarounds_init(struct drm_i915_private *dev_priv)
 			    GEN7_DISABLE_SAMPLER_PREFETCH);
 }
 
+static void wa_init_start(struct i915_wa_list *wal, const char *name)
+{
+	wal->name = name;
+}
+
+static void wa_init_finish(struct i915_wa_list *wal)
+{
+	if (wal->count)
+		DRM_DEBUG_DRIVER("Initialized %u %s workarounds\n",
+				 wal->count, wal->name);
+}
+
 void intel_gt_workarounds_init(struct drm_i915_private *dev_priv)
 {
 	struct i915_wa_list *wal = &dev_priv->gt_wa_list;
 
-	wal->name = "GT";
+	wa_init_start(wal, "GT");
 
 	if (INTEL_GEN(dev_priv) < 8)
 		return;
@@ -921,8 +933,7 @@ void intel_gt_workarounds_init(struct drm_i915_private *dev_priv)
 	else
 		MISSING_CASE(INTEL_GEN(dev_priv));
 
-	DRM_DEBUG_DRIVER("Initialized %u %s workarounds\n",
-			 wal->count, wal->name);
+	wa_init_finish(wal);
 }
 
 static void
@@ -1113,7 +1124,7 @@ void intel_whitelist_workarounds_init(struct intel_engine_cs *engine)
 
 	GEM_BUG_ON(engine->id != RCS);
 
-	w->name = "whitelist";
+	wa_init_start(w, "whitelist");
 
 	if (INTEL_GEN(i915) < 8)
 		return;
@@ -1138,8 +1149,7 @@ void intel_whitelist_workarounds_init(struct intel_engine_cs *engine)
 	else
 		MISSING_CASE(INTEL_GEN(i915));
 
-	DRM_DEBUG_DRIVER("Initialized %u %s workarounds\n",
-			 w->count, w->name);
+	wa_init_finish(w);
 }
 
 void intel_whitelist_workarounds_apply(struct intel_engine_cs *engine)
@@ -1307,15 +1317,14 @@ void intel_engine_workarounds_init(struct intel_engine_cs *engine)
 	if (GEM_WARN_ON(INTEL_GEN(engine->i915) < 8))
 		return;
 
-	wal->name = engine->name;
+	wa_init_start(wal, engine->name);
 
 	if (engine->id == RCS)
 		rcs_engine_wa_init(engine);
 	else
 		xcs_engine_wa_init(engine);
 
-	DRM_DEBUG_DRIVER("Initialized %u %s workarounds\n",
-			 wal->count, wal->name);
+	wa_init_finish(wal);
 }
 
 void intel_engine_workarounds_apply(struct intel_engine_cs *engine)
-- 
2.19.1