From 3eae31a551312eda363acffad4032ffe3e3ec398 Mon Sep 17 00:00:00 2001 From: jsg Date: Fri, 28 Jun 2024 03:33:00 +0000 Subject: [PATCH] drm/i915/mso: using joiner is not possible with eDP MSO From Jani Nikula e7bda1f8ba8436266f7e49778009bf9995d1c801 in linux-6.6.y/6.6.36 49cc17967be95d64606d5684416ee51eec35e84a in mainline linux --- sys/dev/pci/drm/i915/display/intel_dp.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/pci/drm/i915/display/intel_dp.c b/sys/dev/pci/drm/i915/display/intel_dp.c index f32ec5ca378..f80bd9f0363 100644 --- a/sys/dev/pci/drm/i915/display/intel_dp.c +++ b/sys/dev/pci/drm/i915/display/intel_dp.c @@ -393,6 +393,10 @@ bool intel_dp_can_bigjoiner(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.20.1