drm/i915/display: convert W/As in intel_dp_mst.c to new framework

Convert the low-hanging fruits of workaround checks to the workaround
framework.  Instead of having display structure checks for the
workarounds all over, concentrate the checks in intel_display_wa.c.

Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://patch.msgid.link/20260305100100.332956-10-luciano.coelho@intel.com
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c
index 2934331d905f87dd6e9e2c1b69ddb6ac2077fca5..be37a23edce43bec95092391b303252fa2c91a8b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_wa.c
+++ b/drivers/gpu/drm/i915/display/intel_display_wa.c
@@ -94,6 +94,8 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa,
        case INTEL_DISPLAY_WA_14011765242:
                return display->platform.alderlake_s &&
                        IS_DISPLAY_STEP(display, STEP_A0, STEP_A2);
+       case INTEL_DISPLAY_WA_14014143976:
+               return IS_DISPLAY_STEP(display, STEP_E0, STEP_FOREVER);
        case INTEL_DISPLAY_WA_14020863754:
                return DISPLAY_VERx100(display) == 3000 ||
                        DISPLAY_VERx100(display) == 2000 ||

diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h b/drivers/gpu/drm/i915/display/intel_display_wa.h
index b781a3c6d803e1fcf8563d4106acb5eab584450e..dc1a187fd0a15a747e2c3d3a971f39e0ec5b768f 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_wa.h
+++ b/drivers/gpu/drm/i915/display/intel_display_wa.h
@@ -36,6 +36,7 @@ enum intel_display_wa {
        INTEL_DISPLAY_WA_14011503117,
        INTEL_DISPLAY_WA_14011508470,
        INTEL_DISPLAY_WA_14011765242,
+       INTEL_DISPLAY_WA_14014143976,
        INTEL_DISPLAY_WA_14020863754,
        INTEL_DISPLAY_WA_14025769978,
        INTEL_DISPLAY_WA_15013987218,

diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 0bb39f9bd74ef42115733b29baad65ce137d0efa..887b6de14e46776c1244ce4d51bd46c3a4105d33 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -43,6 +43,7 @@
 #include "intel_display_regs.h"
 #include "intel_display_types.h"
 #include "intel_display_utils.h"
+#include "intel_display_wa.h"
 #include "intel_dp.h"
 #include "intel_dp_hdcp.h"
 #include "intel_dp_link_training.h"
@@ -1276,7 +1277,7 @@ static void enable_bs_jitter_was(const struct intel_crtc_state *crtc_state)
                set |= DP_MST_FEC_BS_JITTER_WA(crtc_state->cpu_transcoder);
 
        /* Wa_14014143976:adlp */
-       if (IS_DISPLAY_STEP(display, STEP_E0, STEP_FOREVER)) {
+       if (intel_display_wa(display, INTEL_DISPLAY_WA_14014143976)) {
                if (intel_dp_is_uhbr(crtc_state))
                        set |= DP_MST_SHORT_HBLANK_WA(crtc_state->cpu_transcoder);
                else if (crtc_state->fec_enable)