diff options
| author |   Lyude Paul <lyude@redhat.com> | 2021-02-16 21:53:37 -0500 |
|---|---|---|
| committer | Lyude Paul <lyude@redhat.com> | 2021-03-02 16:38:40 -0500 |
| commit | cec3295b246b5555f6de7570d25a13a2754de245 (patch) | |
| tree | 5047684f8dd16c627d0f728212e50ebe74e0b9cf /drivers/gpu/drm/i915/i915_irq.c | |
| parent | drm/i915/gen9bc: Handle TGP PCH during suspend/resume (diff) | |
| download | linux-dev-cec3295b246b5555f6de7570d25a13a2754de245.tar.xz linux-dev-cec3295b246b5555f6de7570d25a13a2754de245.zip | |
drm/i915/icp+: Use icp_hpd_irq_setup() instead of spt_hpd_irq_setup()
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 <tejaskumarx.surendrakumar.upadhyay@intel.com>
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210217025337.1929015-2-lyude@redhat.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e0804049f42b..5cfaec500a60 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -4319,6 +4319,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 |