diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-06-21 11:55:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-06-21 11:55:26 +1000 |
| commit | a8080132ed0bdf238bf5b6616ad84e1a4797b331 (patch) | |
| tree | f49a34221969de81740577ae3710373280928714 | |
| parent | 6ba59ff4227927d3a8530fc2973b80e94b54d58f (diff) | |
| parent | 49cc17967be95d64606d5684416ee51eec35e84a (diff) | |
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: Dave Airlie <airlied@redhat.com>
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/875xu5fbyr.fsf@intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index e05e25cd4a94..5b3b6ae1e3d7 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -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); |