drm/i915/display: convert W/As in intel_display_device.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-9-luciano.coelho@intel.com
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index 7ecbef58a7c5f1d3737479a188cc3b38df442c4c..55689111c5d7ba4ae213ed8881761d8fa530106e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -19,6 +19,7 @@
 #include "intel_display_reg_defs.h"
 #include "intel_display_regs.h"
 #include "intel_display_types.h"
+#include "intel_display_wa.h"
 #include "intel_fbc.h"
 #include "intel_step.h"
 
@@ -1772,7 +1773,7 @@ static void __intel_display_device_info_runtime_init(struct intel_display *displ
                display_runtime->port_mask |= BIT(PORT_F);
 
        /* Wa_14011765242: adl-s A0,A1 */
-       if (display->platform.alderlake_s && IS_DISPLAY_STEP(display, STEP_A0, STEP_A2))
+       if (intel_display_wa(display, INTEL_DISPLAY_WA_14011765242))
                for_each_pipe(display, pipe)
                        display_runtime->num_scalers[pipe] = 0;
        else if (DISPLAY_VER(display) >= 11) {

diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c
index f51e5a86164b9711e6c8c96add5244273b1571ee..2934331d905f87dd6e9e2c1b69ddb6ac2077fca5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_wa.c
+++ b/drivers/gpu/drm/i915/display/intel_display_wa.c
@@ -91,6 +91,9 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa,
                return DISPLAY_VER(display) == 13;
        case INTEL_DISPLAY_WA_14011508470:
                return (IS_DISPLAY_VERx100(display, 1200, 1300));
+       case INTEL_DISPLAY_WA_14011765242:
+               return display->platform.alderlake_s &&
+                       IS_DISPLAY_STEP(display, STEP_A0, STEP_A2);
        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 a9346e7631128ea873118cf1a5e4e92b015ebd36..b781a3c6d803e1fcf8563d4106acb5eab584450e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_wa.h
+++ b/drivers/gpu/drm/i915/display/intel_display_wa.h
@@ -35,6 +35,7 @@ enum intel_display_wa {
        INTEL_DISPLAY_WA_14011503030,
        INTEL_DISPLAY_WA_14011503117,
        INTEL_DISPLAY_WA_14011508470,
+       INTEL_DISPLAY_WA_14011765242,
        INTEL_DISPLAY_WA_14020863754,
        INTEL_DISPLAY_WA_14025769978,
        INTEL_DISPLAY_WA_15013987218,