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_overlay.c | 1 + 3 files changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c b/drivers/gpu/drm/i915/display/intel_display_wa.c index 72f645686efd..65ad82c67301 100644 --- a/drivers/gpu/drm/i915/display/intel_display_wa.c +++ b/drivers/gpu/drm/i915/display/intel_display_wa.c @@ -130,6 +130,8 @@ bool __intel_display_wa(struct intel_display *display, enum intel_display_wa wa, IS_DISPLAY_STEP(display, STEP_A0, STEP_B0); case INTEL_DISPLAY_WA_22014263786: return IS_DISPLAY_VERx100(display, 1100, 1400); + case INTEL_DISPLAY_WA_22018444074: + return !display->platform.meteorlake; case INTEL_DISPLAY_WA_22021048059: return IS_DISPLAY_VER(display, 14, 35); default: diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h b/drivers/gpu/drm/i915/display/intel_display_wa.h index d8359f88de29..44d06b074b0f 100644 --- a/drivers/gpu/drm/i915/display/intel_display_wa.h +++ b/drivers/gpu/drm/i915/display/intel_display_wa.h @@ -52,6 +52,7 @@ enum intel_display_wa { INTEL_DISPLAY_WA_22011320316, INTEL_DISPLAY_WA_22012358565, INTEL_DISPLAY_WA_22014263786, + INTEL_DISPLAY_WA_22018444074, INTEL_DISPLAY_WA_22021048059, }; diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c index e7838f4d2dac..1a47878dc805 100644 --- a/drivers/gpu/drm/i915/display/intel_overlay.c +++ b/drivers/gpu/drm/i915/display/intel_overlay.c @@ -42,6 +42,7 @@ #include "intel_de.h" #include "intel_display_regs.h" #include "intel_display_types.h" +#include "intel_display_wa.h" #include "intel_frontbuffer.h" #include "intel_overlay.h" #include "intel_pci_config.h" -- 2.51.0
