From f5dd68fd639eab818a097c41d7f550a7237b4e7d Mon Sep 17 00:00:00 2001 From: jsg Date: Mon, 29 Apr 2024 06:12:46 +0000 Subject: [PATCH] drm/i915/mst: Reject FEC+MST on ICL From Ville Syrjala 6711b0817a384bbeb8c951521334d5ef78c855aa in linux-6.6.y/6.6.29 99f855082f228cdcecd6ab768d3b8b505e0eb028 in mainline linux --- sys/dev/pci/drm/i915/display/intel_dp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/i915/display/intel_dp.c b/sys/dev/pci/drm/i915/display/intel_dp.c index 0fc447a75c4..7064200efa3 100644 --- a/sys/dev/pci/drm/i915/display/intel_dp.c +++ b/sys/dev/pci/drm/i915/display/intel_dp.c @@ -1316,7 +1316,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; -- 2.20.1