]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915: Fix FEC pipe A vs. DDI A mixup
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 2 May 2023 14:38:59 +0000 (17:38 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 27 Apr 2024 15:11:28 +0000 (17:11 +0200)
[ Upstream commit 126f94e87e7960ef7ae58180e39c19cc9dcbbf7f ]

On pre-TGL FEC is a port level feature, not a transcoder
level feature, and it's DDI A which doesn't have it, not
trancoder A. Check for the correct thing when determining
whether FEC is supported or not.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230502143906.2401-5-ville.syrjala@linux.intel.com
Reviewed-by: Luca Coelho <luciano.coelho@intel.com>
Stable-dep-of: 99f855082f22 ("drm/i915/mst: Reject FEC+MST on ICL")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/i915/display/intel_dp.c

index 18ee4f2a87f9e91a9b0bb6c8034f873d38fb4a01..fff008955cb2c9851b335aac886719ef0b95004a 100644 (file)
@@ -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;