On 1/26/21 8:11 PM, Aditya Swarup wrote: > From: Matt Roper <matthew.d.roper@xxxxxxxxx> > > ADL-S switches up which PHYs are considered a master to other PHYs; > PHY-C is no longer a master, but PHY-D is now. > > Bspec: 49291 > Cc: Jani Nikula <jani.nikula@xxxxxxxxx> > Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > Cc: Imre Deak <imre.deak@xxxxxxxxx> > Cc: Lucas De Marchi <lucas.demarchi@xxxxxxxxx> > Signed-off-by: Matt Roper <matthew.d.roper@xxxxxxxxx> > Signed-off-by: Aditya Swarup <aditya.swarup@xxxxxxxxx> Reviewed-by: Aditya Swarup <aditya.swarup@xxxxxxxxx> Aditya > --- > drivers/gpu/drm/i915/display/intel_combo_phy.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_combo_phy.c b/drivers/gpu/drm/i915/display/intel_combo_phy.c > index dd45cbafcf42..c55813c6194a 100644 > --- a/drivers/gpu/drm/i915/display/intel_combo_phy.c > +++ b/drivers/gpu/drm/i915/display/intel_combo_phy.c > @@ -187,10 +187,16 @@ static bool has_phy_misc(struct drm_i915_private *i915, enum phy phy) > * Some platforms only expect PHY_MISC to be programmed for PHY-A and > * PHY-B and may not even have instances of the register for the > * other combo PHY's. > + * > + * ADL-S technically has three instances of PHY_MISC, but only requires > + * that we program it for PHY A. > */ > - if (IS_JSL_EHL(i915) || > - IS_ROCKETLAKE(i915) || > - IS_DG1(i915)) > + > + if (IS_ALDERLAKE_S(i915)) > + return phy == PHY_A; > + else if (IS_JSL_EHL(i915) || > + IS_ROCKETLAKE(i915) || > + IS_DG1(i915)) > return phy < PHY_C; > > return true; > _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
