On Thu, Apr 11, 2019 at 05:33:49PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> > > On ICL the DMC doesn't reinit combo PHY B so we should not warn > about its state being bogus during the display core uninit. > > Signed-off-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Yep, and we'll reinit it manually before using it: Reviewed-by: Imre Deak <imre.deak@xxxxxxxxx> > --- > drivers/gpu/drm/i915/intel_combo_phy.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/intel_combo_phy.c b/drivers/gpu/drm/i915/intel_combo_phy.c > index 3d0271cebf99..2bf4359d7e41 100644 > --- a/drivers/gpu/drm/i915/intel_combo_phy.c > +++ b/drivers/gpu/drm/i915/intel_combo_phy.c > @@ -239,7 +239,8 @@ void icl_combo_phys_uninit(struct drm_i915_private *dev_priv) > for_each_combo_port_reverse(dev_priv, port) { > u32 val; > > - if (!icl_combo_phy_verify_state(dev_priv, port)) > + if (port == PORT_A && > + !icl_combo_phy_verify_state(dev_priv, port)) > DRM_WARN("Port %c combo PHY HW state changed unexpectedly\n", > port_name(port)); > > -- > 2.21.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx