> Subject: [PATCH v2 06/15] drm/i915/display: convert W/As in intel_display.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_wa.c.
>
> Acked-by: Jani Nikula <[email protected]>
> Signed-off-by: Luca Coelho <[email protected]>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_display_wa.c | 2 ++
> drivers/gpu/drm/i915/display/intel_display_wa.h | 1 +
> 3 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index bd93add5101b..36312e8444bf 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -454,7 +454,7 @@ void intel_enable_transcoder(const struct
> intel_crtc_state *new_crtc_state)
> }
>
> /* Wa_22012358565:adl-p */
> - if (DISPLAY_VER(display) == 13)
> + if (intel_display_wa(display, 22012358565))
Did you forget to add this as an enum
Regards,
Suraj Kandpal
> intel_de_rmw(display, PIPE_ARB_CTL(display, pipe),
> 0, PIPE_ARB_USE_PROG_SLOTS);
>
> @@ -708,7 +708,7 @@ static void icl_set_pipe_chicken(const struct
> intel_crtc_state *crtc_state)
> tmp |= UNDERRUN_RECOVERY_DISABLE_ADLP;
>
> /* Wa_14010547955:dg2 */
> - if (display->platform.dg2)
> + if (intel_display_wa(display, 14010547955))
> tmp |= DG2_RENDER_CCSTAG_4_3_EN;
>
> intel_de_write(display, PIPE_CHICKEN(pipe), tmp); diff --git
> a/drivers/gpu/drm/i915/display/intel_display_wa.c
> b/drivers/gpu/drm/i915/display/intel_display_wa.c
> index e2bbc3a90eca..744ca7828f06 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_wa.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_wa.c
> @@ -77,6 +77,8 @@ bool __intel_display_wa(struct intel_display *display,
> enum intel_display_wa wa,
> case INTEL_DISPLAY_WA_13012396614:
> return DISPLAY_VERx100(display) == 3000 ||
> DISPLAY_VERx100(display) == 3500;
> + case INTEL_DISPLAY_WA_14010547955:
> + return display->platform.dg2;
> case INTEL_DISPLAY_WA_14010685332:
> return INTEL_PCH_TYPE(display) >= PCH_CNP &&
> INTEL_PCH_TYPE(display) < PCH_DG1;
> diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h
> b/drivers/gpu/drm/i915/display/intel_display_wa.h
> index b9c088025fd7..4fab1b27087a 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_wa.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_wa.h
> @@ -29,6 +29,7 @@ bool intel_display_needs_wa_16023588340(struct
> intel_display *display); enum intel_display_wa {
> INTEL_DISPLAY_WA_1409767108,
> INTEL_DISPLAY_WA_13012396614,
> + INTEL_DISPLAY_WA_14010547955,
> INTEL_DISPLAY_WA_14010685332,
> INTEL_DISPLAY_WA_14011294188,
> INTEL_DISPLAY_WA_14011503030,
> --
> 2.51.0
