drm/i915: Don't use {skl, cnl}_hpd_pin() for bxt/glk

Just let bxt/glk fall back to intel_hpd_pin_default() instead
of using skl_hpd_pin() or cnl_hpd_pin(). Doesn't really matter
since both functions will end up returning the correct hpd pin
anyway, but I find it a bit less confusing when bxt/glk are
fully separated from the logic for the other platforms.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210412054607.18133-5-ville.syrjala@linux.intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index deef24d..e208ded 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -4612,9 +4612,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
                encoder->hpd_pin = ehl_hpd_pin(dev_priv, port);
        else if (IS_DISPLAY_VER(dev_priv, 11))
                encoder->hpd_pin = icl_hpd_pin(dev_priv, port);
-       else if (IS_DISPLAY_VER(dev_priv, 10))
+       else if (IS_CANNONLAKE(dev_priv))
                encoder->hpd_pin = cnl_hpd_pin(dev_priv, port);
-       else if (IS_DISPLAY_VER(dev_priv, 9))
+       else if (IS_DISPLAY_VER(dev_priv, 9) && !IS_BROXTON(dev_priv))
                encoder->hpd_pin = skl_hpd_pin(dev_priv, port);
        else
                encoder->hpd_pin = intel_hpd_pin_default(dev_priv, port);