diff options
author | Dave Airlie <airlied@redhat.com> | 2022-07-12 12:54:42 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2022-07-12 12:55:36 +1000 |
commit | 6db5e0c8692e590734a7ec7455365d9cbaa15ef1 (patch) | |
tree | 740bfd99b0b7f909c8a08c6a2c093675e10b5767 /drivers/gpu/drm/i915/display/intel_ddi.c | |
parent | 344feb7ccf764756937cfd74fa4ac5caba069c99 (diff) | |
parent | 3d9c653cf635849d0c24a1ab17c2752a19f4ded8 (diff) | |
download | linux-6db5e0c8692e590734a7ec7455365d9cbaa15ef1.tar.gz |
Merge tag 'drm-intel-next-2022-07-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next
- Suspend fixes for Display (Jose) - Properly block D3Cold for now (Anshuman) - Eliminate PIPECONF RMWs from .color_commit()(Ville) - Display info clean-up (Ville) - Fix error code (Dan) - Fix possible refcount leak on DP MST (Hangyu) - Other general display clean-ups (Jani, Tom) - Add bios debug logs (Jani) - PCH type clean-up (Ville) Signed-off-by: Dave Airlie <airlied@redhat.com> From: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/YsZNJUVh0iHOtORz@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/display/intel_ddi.c')
-rw-r--r-- | drivers/gpu/drm/i915/display/intel_ddi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 272e1bf6006b..2330604b0bcc 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -4179,7 +4179,7 @@ static enum hpd_pin ehl_hpd_pin(struct drm_i915_private *dev_priv, if (port == PORT_D) return HPD_PORT_A; - if (HAS_PCH_MCC(dev_priv)) + if (HAS_PCH_TGP(dev_priv)) return icl_hpd_pin(dev_priv, port); return HPD_PORT_A + port - PORT_A; |