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_wa.c.
Signed-off-by: Luca Coelho <[email protected]> --- drivers/gpu/drm/i915/display/intel_display_wa.c | 2 ++ drivers/gpu/drm/i915/display/intel_display_wa.h | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c index b45212708110..798e77200751 100644 --- 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 923cb917e727..2e5ce21e0455 100644 --- 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 29713075e413..e338dd12b39e 100644 --- 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" @@ -1274,7 +1275,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, 14014143976)) { if (intel_dp_is_uhbr(crtc_state)) set |= DP_MST_SHORT_HBLANK_WA(crtc_state->cpu_transcoder); else if (crtc_state->fec_enable) -- 2.51.0
