On Fri, 2026-02-13 at 08:42 +0000, Kandpal, Suraj wrote:
> > Subject: [PATCH v2 04/15] drm/i915/display: convert W/As in intel_cursor.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.
>
> * intel_display_wa.c
>
> >
> > Acked-by: Jani Nikula <[email protected]>
> > Signed-off-by: Luca Coelho <[email protected]>
> > ---
> > drivers/gpu/drm/i915/display/intel_cursor.c | 3 ++-
> > drivers/gpu/drm/i915/display/intel_display_wa.c | 1 +
> > drivers/gpu/drm/i915/display/intel_display_wa.h | 1 +
> > 3 files changed, 4 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c
> > b/drivers/gpu/drm/i915/display/intel_cursor.c
> > index 2c5d917fbd7e..53cd27fd4fc7 100644
> > --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> > +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> > @@ -19,6 +19,7 @@
> > #include "intel_display.h"
> > #include "intel_display_types.h"
> > #include "intel_display_utils.h"
> > +#include "intel_display_wa.h"
> > #include "intel_fb.h"
> > #include "intel_fb_pin.h"
> > #include "intel_frontbuffer.h"
> > @@ -424,7 +425,7 @@ static u32 i9xx_cursor_ctl(const struct
> > intel_plane_state *plane_state)
> > cntl |= MCURSOR_ROTATE_180;
> >
> > /* Wa_22012358565:adl-p */
> > - if (DISPLAY_VER(display) == 13)
> > + if (intel_display_wa(display, 22012358565))
>
> Ahh so you define it here
> So with all mentioned comments addressed for this patch
> And ones where WA 22012358565 was questioned.
> Reviewed-by: Suraj Kandpal <[email protected]
>
Yes, this workaround applies to more than one file, so I defined it
here and reused it in subsequent patches.
I'll change all the commit messages as you suggested.
Thanks for the reviews!
--
Cheers,
Luca.
> > cntl |= MCURSOR_ARB_SLOTS(1);
> >
> > return cntl;
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.c
> > b/drivers/gpu/drm/i915/display/intel_display_wa.c
> > index f0311cd477a5..8473cb25c92e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_wa.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_wa.c
> > @@ -85,6 +85,7 @@ bool __intel_display_wa(struct intel_display *display,
> > enum intel_display_wa wa,
> > INTEL_PCH_TYPE(display) < PCH_DG1;
> > case INTEL_DISPLAY_WA_14011503030:
> > case INTEL_DISPLAY_WA_14011503117:
> > + case INTEL_DISPLAY_WA_22012358565:
> > return DISPLAY_VER(display) == 13;
> > case INTEL_DISPLAY_WA_14011508470:
> > return (IS_DISPLAY_VERx100(display, 1200, 1300)); diff --git
> > a/drivers/gpu/drm/i915/display/intel_display_wa.h
> > b/drivers/gpu/drm/i915/display/intel_display_wa.h
> > index 0d0501fc276f..7e5f5a466e2a 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_wa.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_wa.h
> > @@ -42,6 +42,7 @@ enum intel_display_wa {
> > INTEL_DISPLAY_WA_16025573575,
> > INTEL_DISPLAY_WA_22010178259,
> > INTEL_DISPLAY_WA_22011320316,
> > + INTEL_DISPLAY_WA_22012358565,
> > INTEL_DISPLAY_WA_22014263786,
> > INTEL_DISPLAY_WA_22021048059,
> > };
> > --
> > 2.51.0
