Commit 612dc414 authored by Imre Deak's avatar Imre Deak Committed by Radhakrishna Sripada

drm/i915/mtl: Add VBT port and AUX_CH mapping

Add the proper VBT port,AUX_CH -> i915 port,AUX_CH mapping which just
follows the ADL_P one.
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarRadhakrishna Sripada <radhakrishna.sripada@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220818234202.451742-9-radhakrishna.sripada@intel.com
parent b078c16b
...@@ -2420,7 +2420,7 @@ static enum port dvo_port_to_port(struct drm_i915_private *i915, ...@@ -2420,7 +2420,7 @@ static enum port dvo_port_to_port(struct drm_i915_private *i915,
[PORT_TC4] = { DVO_PORT_HDMII, DVO_PORT_DPI, -1 }, [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), return __dvo_port_to_port(ARRAY_SIZE(xelpd_port_mapping),
ARRAY_SIZE(xelpd_port_mapping[0]), ARRAY_SIZE(xelpd_port_mapping[0]),
xelpd_port_mapping, xelpd_port_mapping,
...@@ -3578,7 +3578,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, ...@@ -3578,7 +3578,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,
aux_ch = AUX_CH_C; aux_ch = AUX_CH_C;
break; break;
case DP_AUX_D: case DP_AUX_D:
if (DISPLAY_VER(i915) == 13) if (DISPLAY_VER(i915) >= 13)
aux_ch = AUX_CH_D_XELPD; aux_ch = AUX_CH_D_XELPD;
else if (IS_ALDERLAKE_S(i915)) else if (IS_ALDERLAKE_S(i915))
aux_ch = AUX_CH_USBC3; aux_ch = AUX_CH_USBC3;
...@@ -3588,7 +3588,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, ...@@ -3588,7 +3588,7 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,
aux_ch = AUX_CH_D; aux_ch = AUX_CH_D;
break; break;
case DP_AUX_E: case DP_AUX_E:
if (DISPLAY_VER(i915) == 13) if (DISPLAY_VER(i915) >= 13)
aux_ch = AUX_CH_E_XELPD; aux_ch = AUX_CH_E_XELPD;
else if (IS_ALDERLAKE_S(i915)) else if (IS_ALDERLAKE_S(i915))
aux_ch = AUX_CH_USBC4; aux_ch = AUX_CH_USBC4;
...@@ -3596,25 +3596,25 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915, ...@@ -3596,25 +3596,25 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *i915,
aux_ch = AUX_CH_E; aux_ch = AUX_CH_E;
break; break;
case DP_AUX_F: case DP_AUX_F:
if (DISPLAY_VER(i915) == 13) if (DISPLAY_VER(i915) >= 13)
aux_ch = AUX_CH_USBC1; aux_ch = AUX_CH_USBC1;
else else
aux_ch = AUX_CH_F; aux_ch = AUX_CH_F;
break; break;
case DP_AUX_G: case DP_AUX_G:
if (DISPLAY_VER(i915) == 13) if (DISPLAY_VER(i915) >= 13)
aux_ch = AUX_CH_USBC2; aux_ch = AUX_CH_USBC2;
else else
aux_ch = AUX_CH_G; aux_ch = AUX_CH_G;
break; break;
case DP_AUX_H: case DP_AUX_H:
if (DISPLAY_VER(i915) == 13) if (DISPLAY_VER(i915) >= 13)
aux_ch = AUX_CH_USBC3; aux_ch = AUX_CH_USBC3;
else else
aux_ch = AUX_CH_H; aux_ch = AUX_CH_H;
break; break;
case DP_AUX_I: case DP_AUX_I:
if (DISPLAY_VER(i915) == 13) if (DISPLAY_VER(i915) >= 13)
aux_ch = AUX_CH_USBC4; aux_ch = AUX_CH_USBC4;
else else
aux_ch = AUX_CH_I; aux_ch = AUX_CH_I;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment