]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
drm/i915/ehl: Extend w/a 14010685332 to JSP/MCC
authorSwathi Dhanavanthri <swathi.dhanavanthri@intel.com>
Thu, 21 May 2020 06:44:48 +0000 (23:44 -0700)
committerJosé Roberto de Souza <jose.souza@intel.com>
Fri, 22 May 2020 02:05:11 +0000 (19:05 -0700)
This is a permanent w/a for JSL/EHL.This is to be applied to the
PCH types on JSL/EHL ie JSP/MCC
Bspec: 52888

v2: Fixed the wrong usage of logical OR(ville)
v3: Removed extra braces, changed the check(jose)

Signed-off-by: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200521064448.29522-1-swathi.dhanavanthri@intel.com
drivers/gpu/drm/i915/i915_irq.c

index 95996db46939812033fe052ca47f64a1a41f50e1..efdd4c7b8e92848f2074985779ab45709421c14e 100644 (file)
@@ -2904,8 +2904,10 @@ 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 */
-       if (INTEL_PCH_TYPE(dev_priv) == PCH_ICP) {
+       /* 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) {
                intel_uncore_rmw(uncore, SOUTH_CHICKEN1,
                                 SBCLK_RUN_REFCLK_DIS, SBCLK_RUN_REFCLK_DIS);
                intel_uncore_rmw(uncore, SOUTH_CHICKEN1,