Commit a8080132 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2024-06-19' of... 

Merge tag 'drm-intel-fixes-2024-06-19' of https://gitlab.freedesktop.org/drm/i915/kernel

 into drm-fixes

drm/i915 fixes for v6.10-rc5:
- Fix conditions for joiner usage, it's not possible with eDP MSO

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/875xu5fbyr.fsf@intel.com
parents 6ba59ff4 49cc1796

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

+4 −0
Original line number Diff line number Diff line
@@ -442,6 +442,10 @@ bool intel_dp_has_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);