drm/i915: Extend Wa_14010685332 to all ICP+ PCH's

This workaround now also applies to TGL and RKL, so extend the PCH test
to just capture everthing ICP and beyond.

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200617180006.4130501-1-matthew.d.roper@intel.com
Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com>

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 710224d930c5382457cdad5fcf8ff12b4cb9b2bb..562b43ed077fff4d953ee8102732a3942e223e53 100644 (file)
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2907,10 +2907,8 @@ static void gen11_display_irq_reset(struct drm_i915_private *dev_priv)
        if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
                GEN3_IRQ_RESET(uncore, SDE);
 
-       /* Wa_14010685332:icl,jsl,ehl */
-       if (INTEL_PCH_TYPE(dev_priv) == PCH_ICP ||
-           INTEL_PCH_TYPE(dev_priv) == PCH_JSP ||
-           INTEL_PCH_TYPE(dev_priv) == PCH_MCC) {
+       /* Wa_14010685332:icl,jsl,ehl,tgl,rkl */
+       if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) {
                intel_uncore_rmw(uncore, SOUTH_CHICKEN1,
                                 SBCLK_RUN_REFCLK_DIS, SBCLK_RUN_REFCLK_DIS);
                intel_uncore_rmw(uncore, SOUTH_CHICKEN1,