Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/i915/mso: using joiner is not possible with eDP MSO
@ 2024-06-14 14:23 Jani Nikula
  2024-06-14 14:32 ` ✓ CI.Patch_applied: success for " Patchwork
                   ` (8 more replies)
  0 siblings, 9 replies; 11+ messages in thread
From: Jani Nikula @ 2024-06-14 14:23 UTC (permalink / raw)
  To: intel-gfx, intel-xe; +Cc: jani.nikula, ville.syrjala, stable

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@vger.kernel.org
Cc: Ville Syrjala <ville.syrjala@linux.intel.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/1668
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

---

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


^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2024-06-17  8:50 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-14 14:23 [PATCH] drm/i915/mso: using joiner is not possible with eDP MSO Jani Nikula
2024-06-14 14:32 ` ✓ CI.Patch_applied: success for " Patchwork
2024-06-14 14:33 ` ✓ CI.checkpatch: " Patchwork
2024-06-14 14:34 ` ✓ CI.KUnit: " Patchwork
2024-06-14 14:39 ` [PATCH] " Ville Syrjälä
2024-06-17  8:50   ` Jani Nikula
2024-06-14 14:46 ` ✓ CI.Build: success for " Patchwork
2024-06-14 14:48 ` ✗ CI.Hooks: failure " Patchwork
2024-06-14 14:49 ` ✗ CI.checksparse: warning " Patchwork
2024-06-14 15:11 ` ✓ CI.BAT: success " Patchwork
2024-06-15  1:44 ` ✗ CI.FULL: failure " Patchwork

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox