On Fri, 14 Jun 2024, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > On Fri, Jun 14, 2024 at 05:23:11PM +0300, Jani Nikula wrote: >> It's not possible to use the joiner at the same time with eDP MSO. When >> a panel needs MSO, it's not optional, so MSO trumps joiner. >> >> v3: Only change intel_dp_has_joiner(), leave debugfs alone (Ville) >> >> Cc: stable@xxxxxxxxxxxxxxx >> Cc: Ville Syrjala <ville.syrjala@xxxxxxxxxxxxxxx> >> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1668 >> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx> > > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Thanks, pushed to din with Fixes: bc71194e8897 ("drm/i915/edp: enable eDP MSO during link training") Cc: <stable@xxxxxxxxxxxxxxx> # v5.13+ BR, Jani. > >> >> --- >> >> Just the minimal fix for starters to move things along. >> --- >> drivers/gpu/drm/i915/display/intel_dp.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c >> index 9a9bb0f5b7fe..ab33c9de393a 100644 >> --- a/drivers/gpu/drm/i915/display/intel_dp.c >> +++ b/drivers/gpu/drm/i915/display/intel_dp.c >> @@ -465,6 +465,10 @@ bool intel_dp_has_joiner(struct intel_dp *intel_dp) >> struct intel_encoder *encoder = &intel_dig_port->base; >> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev); >> >> + /* eDP MSO is not compatible with joiner */ >> + if (intel_dp->mso_link_count) >> + return false; >> + >> return DISPLAY_VER(dev_priv) >= 12 || >> (DISPLAY_VER(dev_priv) == 11 && >> encoder->port != PORT_A); >> -- >> 2.39.2 -- Jani Nikula, Intel
