Skip to content

Commit 49cc179

Browse files
committed
drm/i915/mso: using joiner is not possible with eDP MSO
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) Fixes: bc71194 ("drm/i915/edp: enable eDP MSO during link training") Cc: <stable@vger.kernel.org> # v5.13+ Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1668 Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240614142311.589089-1-jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> (cherry picked from commit 8b5a92c) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
1 parent 6ba59ff commit 49cc179

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,10 @@ bool intel_dp_has_bigjoiner(struct intel_dp *intel_dp)
442442
struct intel_encoder *encoder = &intel_dig_port->base;
443443
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
444444

445+
/* eDP MSO is not compatible with joiner */
446+
if (intel_dp->mso_link_count)
447+
return false;
448+
445449
return DISPLAY_VER(dev_priv) >= 12 ||
446450
(DISPLAY_VER(dev_priv) == 11 &&
447451
encoder->port != PORT_A);

0 commit comments

Comments
 (0)