Commit 93a64971 authored by Anusha Srivatsa's avatar Anusha Srivatsa Committed by Lucas De Marchi
Browse files

drm/i915/adl_p: Setup ports/phys 



The SoC has 6 DDI ports(DDI A,DDI B and DDI TC1-4.
The first two are connected to combo phys while
the rest are connected to TC phys.

Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Clinton Taylor <clinton.a.taylor@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Swathi Dhanavanthri <swathi.dhanavanthri@intel.com>
Signed-off-by: default avatarAnusha Srivatsa <anusha.srivatsa@intel.com>
Signed-off-by: default avatarClinton Taylor <Clinton.A.Taylor@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210519000625.3184321-5-lucas.demarchi@intel.com
parent 7959ffe5

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

+11 −2
Original line number Diff line number Diff line
@@ -3675,7 +3675,9 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy) 


bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)

{

	if (IS_TIGERLAKE(dev_priv))

	if (IS_ALDERLAKE_P(dev_priv))

		return phy >= PHY_F && phy <= PHY_I;

	else if (IS_TIGERLAKE(dev_priv))

		return phy >= PHY_D && phy <= PHY_I;

	else if (IS_ICELAKE(dev_priv))

		return phy >= PHY_C && phy <= PHY_F;
@@ -11251,7 +11253,14 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv) 
	if (!HAS_DISPLAY(dev_priv))

		return;



	if (IS_ALDERLAKE_S(dev_priv)) {

	if (IS_ALDERLAKE_P(dev_priv)) {

		intel_ddi_init(dev_priv, PORT_A);

		intel_ddi_init(dev_priv, PORT_B);

		intel_ddi_init(dev_priv, PORT_TC1);

		intel_ddi_init(dev_priv, PORT_TC2);

		intel_ddi_init(dev_priv, PORT_TC3);

		intel_ddi_init(dev_priv, PORT_TC4);

	} else if (IS_ALDERLAKE_S(dev_priv)) {

		intel_ddi_init(dev_priv, PORT_A);

		intel_ddi_init(dev_priv, PORT_TC1);

		intel_ddi_init(dev_priv, PORT_TC2);