Commit 67807f52 authored by Matt Roper's avatar Matt Roper Committed by Lucas De Marchi
Browse files

drm/i915/dg1: provide port/phy mapping for vbt 



As with RKL, DG1's VBT outputs are indexed according to PHY rather than
DDI.

Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201007002210.3678024-8-lucas.demarchi@intel.com
parent e73e4c59

drivers/gpu/drm/i915/display/intel_bios.c

+5 −3
Original line number Diff line number Diff line
@@ -1675,7 +1675,7 @@ static enum port dvo_port_to_port(struct drm_i915_private *dev_priv, 
		[PORT_E] = { DVO_PORT_HDMID, DVO_PORT_DPD, -1 },

	};



	if (IS_ROCKETLAKE(dev_priv))

	if (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv))

		return __dvo_port_to_port(ARRAY_SIZE(rkl_port_mapping),

					  ARRAY_SIZE(rkl_port_mapping[0]),

					  rkl_port_mapping,
@@ -2640,10 +2640,12 @@ enum aux_ch intel_bios_port_aux_ch(struct drm_i915_private *dev_priv, 
		aux_ch = AUX_CH_B;

		break;

	case DP_AUX_C:

		aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_D : AUX_CH_C;

		aux_ch = (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv)) ?

			AUX_CH_D : AUX_CH_C;

		break;

	case DP_AUX_D:

		aux_ch = IS_ROCKETLAKE(dev_priv) ? AUX_CH_E : AUX_CH_D;

		aux_ch = (IS_DG1(dev_priv) || IS_ROCKETLAKE(dev_priv)) ?

			AUX_CH_E : AUX_CH_D;

		break;

	case DP_AUX_E:

		aux_ch = AUX_CH_E;