On Mon, 12 Apr 2021, Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > 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. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> The whole hpd pin code could use a relocation from intel_ddi.c and some overhaul. But first things first, Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx> > --- > drivers/gpu/drm/i915/display/intel_ddi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c > index deef24da00b5..e208ded9a688 100644 > --- 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); -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
