From: jsg <jsg@openbsd.org>
Date: Mon, 29 Apr 2024 06:10:41 +0000 (+0000)
Subject: drm/i915: Fix FEC pipe A vs. DDI A mixup
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=12f3d135d4e999c112eacc6b7e0eb83c8fa73842;p=openbsd

drm/i915: Fix FEC pipe A vs. DDI A mixup

From Ville Syrjala
6b625d2743b464a16904feb5520462041e3d3ce2 in linux-6.6.y/6.6.29
126f94e87e7960ef7ae58180e39c19cc9dcbbf7f in mainline linux
---

diff --git a/sys/dev/pci/drm/i915/display/intel_dp.c b/sys/dev/pci/drm/i915/display/intel_dp.c
index aec73c8a889..0fc447a75c4 100644
--- a/sys/dev/pci/drm/i915/display/intel_dp.c
+++ b/sys/dev/pci/drm/i915/display/intel_dp.c
@@ -1310,13 +1310,13 @@ bool intel_dp_has_hdmi_sink(struct intel_dp *intel_dp)
 static bool intel_dp_source_supports_fec(struct intel_dp *intel_dp,
 					 const struct intel_crtc_state *pipe_config)
 {
+	struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
 	struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
 
-	/* On TGL, FEC is supported on all Pipes */
 	if (DISPLAY_VER(dev_priv) >= 12)
 		return true;
 
-	if (DISPLAY_VER(dev_priv) == 11 && pipe_config->cpu_transcoder != TRANSCODER_A)
+	if (DISPLAY_VER(dev_priv) == 11 && encoder->port != PORT_A)
 		return true;
 
 	return false;