| Message ID | 20220728013420.3750388-9-radhakrishna.sripada@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Initial Meteorlake Support | expand |
On Wed, Jul 27, 2022 at 06:34:05PM -0700, Radhakrishna Sripada wrote: > From: Imre Deak <imre.deak@intel.com> > > Add the proper VBT port,AUX_CH -> i915 port,AUX_CH mapping which just > follows the ADL_P one. > > Signed-off-by: Imre Deak <imre.deak@intel.com> This doesn't seem to be documented in the bspec in the usual places (e.g., page 20124), but in general we should always assume the next platform inherits the behavior of the previous platform unless there's information to suggest different behavior, so Reviewed-by: Matt Roper <matthew.d.roper@intel.com> > --- > drivers/gpu/drm/i915/display/intel_bios.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c > index 51dde5bfd956..2971505bcf2a 100644 > --- a/drivers/gpu/drm/i915/display/intel_bios.c > +++ b/drivers/gpu/drm/i915/display/intel_bios.c > @@ -2418,7 +2418,7 @@ static enum port dvo_port_to_port(struct drm_i915_private *i915, > [PORT_TC4] = { DVO_PORT_HDMII, DVO_PORT_DPI, -1 }, > }; > > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > return __dvo_port_to_port(ARRAY_SIZE(xelpd_port_mapping), > ARRAY_SIZE(xelpd_port_mapping[0]), > xelpd_port_mapping, > @@ -3576,7 +3576,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, > aux_ch = AUX_CH_C; > break; > case DP_AUX_D: > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > aux_ch = AUX_CH_D_XELPD; > else if (IS_ALDERLAKE_S(i915)) > aux_ch = AUX_CH_USBC3; > @@ -3586,7 +3586,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, > aux_ch = AUX_CH_D; > break; > case DP_AUX_E: > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > aux_ch = AUX_CH_E_XELPD; > else if (IS_ALDERLAKE_S(i915)) > aux_ch = AUX_CH_USBC4; > @@ -3594,25 +3594,25 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, > aux_ch = AUX_CH_E; > break; > case DP_AUX_F: > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > aux_ch = AUX_CH_USBC1; > else > aux_ch = AUX_CH_F; > break; > case DP_AUX_G: > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > aux_ch = AUX_CH_USBC2; > else > aux_ch = AUX_CH_G; > break; > case DP_AUX_H: > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > aux_ch = AUX_CH_USBC3; > else > aux_ch = AUX_CH_H; > break; > case DP_AUX_I: > - if (DISPLAY_VER(i915) == 13) > + if (DISPLAY_VER(i915) >= 13) > aux_ch = AUX_CH_USBC4; > else > aux_ch = AUX_CH_I; > -- > 2.25.1 >
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index 51dde5bfd956..2971505bcf2a 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -2418,7 +2418,7 @@ static enum port dvo_port_to_port(struct drm_i915_private *i915, [PORT_TC4] = { DVO_PORT_HDMII, DVO_PORT_DPI, -1 }, }; - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) return __dvo_port_to_port(ARRAY_SIZE(xelpd_port_mapping), ARRAY_SIZE(xelpd_port_mapping[0]), xelpd_port_mapping, @@ -3576,7 +3576,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, aux_ch = AUX_CH_C; break; case DP_AUX_D: - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) aux_ch = AUX_CH_D_XELPD; else if (IS_ALDERLAKE_S(i915)) aux_ch = AUX_CH_USBC3; @@ -3586,7 +3586,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, aux_ch = AUX_CH_D; break; case DP_AUX_E: - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) aux_ch = AUX_CH_E_XELPD; else if (IS_ALDERLAKE_S(i915)) aux_ch = AUX_CH_USBC4; @@ -3594,25 +3594,25 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, aux_ch = AUX_CH_E; break; case DP_AUX_F: - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) aux_ch = AUX_CH_USBC1; else aux_ch = AUX_CH_F; break; case DP_AUX_G: - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) aux_ch = AUX_CH_USBC2; else aux_ch = AUX_CH_G; break; case DP_AUX_H: - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) aux_ch = AUX_CH_USBC3; else aux_ch = AUX_CH_H; break; case DP_AUX_I: - if (DISPLAY_VER(i915) == 13) + if (DISPLAY_VER(i915) >= 13) aux_ch = AUX_CH_USBC4; else aux_ch = AUX_CH_I;