diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2024-04-02 16:51:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-10 16:38:22 +0200 |
| commit | fca2eda2cc3b76a4bb5f292afe2f5e1638781e55 (patch) | |
| tree | 991c8efd15d5847ad699a0f4162ac53da5d94d64 | |
| parent | aceb38b4df7a136813efb5680b4c03f6a4163e97 (diff) | |
| download | linux-stable-fca2eda2cc3b76a4bb5f292afe2f5e1638781e55.tar.gz linux-stable-fca2eda2cc3b76a4bb5f292afe2f5e1638781e55.tar.bz2 linux-stable-fca2eda2cc3b76a4bb5f292afe2f5e1638781e55.zip | |
drm/i915/mst: Reject FEC+MST on ICL
commit 99f855082f228cdcecd6ab768d3b8b505e0eb028 upstream.
ICL supposedly doesn't support FEC on MST. Reject it.
Cc: stable@vger.kernel.org
Fixes: d51f25eb479a ("drm/i915: Add DSC support to MST path")
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240402135148.23011-7-ville.syrjala@linux.intel.com
(cherry picked from commit b648ce2a28ba83c4fa67c61fcc5983e15e9d4afb)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_dp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 820cc9d3cc0b..76373d5bf214 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1422,7 +1422,8 @@ static bool intel_dp_source_supports_fec(struct intel_dp *intel_dp, if (DISPLAY_VER(dev_priv) >= 12) return true; - if (DISPLAY_VER(dev_priv) == 11 && encoder->port != PORT_A) + if (DISPLAY_VER(dev_priv) == 11 && encoder->port != PORT_A && + !intel_crtc_has_type(pipe_config, INTEL_OUTPUT_DP_MST)) return true; return false; |