From: Lyude Paul Date: Wed, 2 Jun 2021 12:44:00 +0000 (+0200) Subject: drm/i915/icp+: Use icp_hpd_irq_setup() instead of spt_hpd_irq_setup() X-Git-Tag: Ubuntu-5.11.0-23.24~29 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8d6a19eeca75f9ee917417044fb5329f5e97041c;p=mirror_ubuntu-hirsute-kernel.git drm/i915/icp+: Use icp_hpd_irq_setup() instead of spt_hpd_irq_setup() BugLink: https://bugs.launchpad.net/bugs/1930582 While reviewing patches for handling workarounds related to gen9 bc, Imre from Intel discovered that we're using spt_hpd_irq_setup() on ICP+ PCHs despite it being almost the same as icp_hpd_irq_setup(). Since we need to be calling icp_hpd_irq_setup() to ensure that CML-S/TGP platforms function correctly anyway, let's move platforms using PCH_ICP which aren't handled by gen11_hpd_irq_setup() over to icp_hpd_irq_setup(). Cc: Tejas Upadhyay Signed-off-by: Lyude Paul Reviewed-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20210217025337.1929015-2-lyude@redhat.com (cherry picked from commit cec3295b246b5555f6de7570d25a13a2754de245) Signed-off-by: Kai-Heng Feng Acked-by: Krzysztof Kozlowski Acked-by: Guilherme Piccoli Signed-off-by: Stefan Bader --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 1f379011bf1d..f1854cbcd877 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -4280,6 +4280,8 @@ void intel_irq_init(struct drm_i915_private *dev_priv) dev_priv->display.hpd_irq_setup = gen11_hpd_irq_setup; else if (IS_GEN9_LP(dev_priv)) dev_priv->display.hpd_irq_setup = bxt_hpd_irq_setup; + else if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP) + dev_priv->display.hpd_irq_setup = icp_hpd_irq_setup; else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT) dev_priv->display.hpd_irq_setup = spt_hpd_irq_setup; else