mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-11 19:19:42 +00:00
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:bc71194e88
("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 commit8b5a92ca24
) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
parent
6ba59ff422
commit
49cc17967b
1 changed files with 4 additions and 0 deletions
|
@ -442,6 +442,10 @@ bool intel_dp_has_bigjoiner(struct intel_dp *intel_dp)
|
||||||
struct intel_encoder *encoder = &intel_dig_port->base;
|
struct intel_encoder *encoder = &intel_dig_port->base;
|
||||||
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
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 ||
|
return DISPLAY_VER(dev_priv) >= 12 ||
|
||||||
(DISPLAY_VER(dev_priv) == 11 &&
|
(DISPLAY_VER(dev_priv) == 11 &&
|
||||||
encoder->port != PORT_A);
|
encoder->port != PORT_A);
|
||||||
|
|
Loading…
Reference in a new issue