summaryrefslogtreecommitdiff
path: root/sys/dev/pci/drm/i915/display
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2024-04-29 06:12:47 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2024-04-29 06:12:47 +0000
commitc0c3ac1aaa6b753af4fd3bae078df7a4f44124e7 (patch)
tree7c094f1124495742e397f05afe9f77141cadf1e7 /sys/dev/pci/drm/i915/display
parent7a24019c5d6fbc514791b6c7ac6fef1125218786 (diff)
drm/i915/mst: Reject FEC+MST on ICL
From Ville Syrjala 6711b0817a384bbeb8c951521334d5ef78c855aa in linux-6.6.y/6.6.29 99f855082f228cdcecd6ab768d3b8b505e0eb028 in mainline linux
Diffstat (limited to 'sys/dev/pci/drm/i915/display')
-rw-r--r--sys/dev/pci/drm/i915/display/intel_dp.c3
1 files changed, 2 insertions, 1 deletions
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;