[Intel-gfx] [PATCH] drm/i915/cnl: Remove useless CNL A-stepping workarounds.

[Rodrigo Vivi]

These were always useless since CNL A stepping needed many
more workarounds that were never introduced and also
we started Linux work on CNL B stepping anyways.

v2: Clinton noticed this isolated patch outside of series
    wasn't compiling due to missing brackets.

Cc: Clinton Taylor <clinton.a.taylor at intel.com>
Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>
---
 drivers/gpu/drm/i915/intel_pm.c    | 10 ++--------
 drivers/gpu/drm/i915/intel_wopcm.c |  3 +--
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 82c82e233154..e1b712a43162 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -4824,12 +4824,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
 	}
 
 	/*
-	 * Display WA #826 (SKL:ALL, BXT:ALL) & #1059 (CNL:A)
+	 * Display WA #826 (SKL:ALL, BXT:ALL)
 	 * disable wm level 1-7 on NV12 planes
 	 */
 	if (wp->is_planar && level >= 1 &&
-	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv) ||
-	     IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))) {
+	    (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))) {
 		result->plane_en = false;
 		return 0;
 	}
@@ -4953,11 +4952,6 @@ static void skl_compute_transition_wm(const struct intel_crtc_state *cstate,
 				trans_offset_b;
 	} else {
 		res_blocks = wm0_sel_res_b + trans_offset_b;
-
-		/* WA BUG:1938466 add one block for non y-tile planes */
-		if (IS_CNL_REVID(dev_priv, CNL_REVID_A0, CNL_REVID_A0))
-			res_blocks += 1;
-
 	}
 
 	res_blocks += 1;
diff --git a/drivers/gpu/drm/i915/intel_wopcm.c b/drivers/gpu/drm/i915/intel_wopcm.c
index 92cb82dd0c07..b8ee8669c260 100644
--- a/drivers/gpu/drm/i915/intel_wopcm.c
+++ b/drivers/gpu/drm/i915/intel_wopcm.c
@@ -133,8 +133,7 @@ static inline int check_hw_restriction(struct drm_i915_private *i915,
 	if (IS_GEN9(i915))
 		err = gen9_check_dword_gap(guc_wopcm_base, guc_wopcm_size);
 
-	if (!err &&
-	    (IS_GEN9(i915) || IS_CNL_REVID(i915, CNL_REVID_A0, CNL_REVID_A0)))
+	if (!err && IS_GEN9(i915))
 		err = gen9_check_huc_fw_fits(guc_wopcm_size, huc_fw_size);
 
 	return err;
-- 
2.19.1