[PATCH] drm/i915/display: WA_14011503117
Garg, Nemesa
nemesa.garg at intel.com
Tue Jul 29 17:17:04 UTC 2025
> -----Original Message-----
> From: Jani Nikula <jani.nikula at linux.intel.com>
> Sent: Monday, July 28, 2025 4:42 PM
> To: Garg, Nemesa <nemesa.garg at intel.com>; intel-gfx at lists.freedesktop.org
> Cc: Garg, Nemesa <nemesa.garg at intel.com>
> Subject: Re: [PATCH] drm/i915/display: WA_14011503117
>
> On Fri, 25 Jul 2025, Nemesa Garg <nemesa.garg at intel.com> wrote:
> > Before enabling the scaler mask the bit and after enabling the scaler,
> > in the later stage after waiting for a frame unmask the PS_ECC bit and
> > ERR_FATAL_MASK bit.
> >
> > Signed-off-by: Nemesa Garg <nemesa.garg at intel.com>
> > ---
> > drivers/gpu/drm/i915/display/intel_display.c | 4 +++
> > .../gpu/drm/i915/display/intel_display_wa.c | 13 ++++++++
> > .../gpu/drm/i915/display/intel_display_wa.h | 1 +
> > drivers/gpu/drm/i915/display/skl_scaler.c | 31 +++++++++++++++++++
> > drivers/gpu/drm/i915/display/skl_scaler.h | 4 +++
> > 5 files changed, 53 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> > b/drivers/gpu/drm/i915/display/intel_display.c
> > index 7035c1fc9033..97664fd1b9c3 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display.c
> > @@ -76,6 +76,7 @@
> > #include "intel_display_regs.h"
> > #include "intel_display_rpm.h"
> > #include "intel_display_types.h"
> > +#include "intel_display_wa.h"
> > #include "intel_dmc.h"
> > #include "intel_dp.h"
> > #include "intel_dp_link_training.h"
> > @@ -1081,6 +1082,9 @@ static void intel_post_plane_update(struct
> intel_atomic_state *state,
> > if (audio_enabling(old_crtc_state, new_crtc_state))
> > intel_encoders_audio_enable(state, crtc);
> >
> > + if (intel_display_wa(display, 14011503117))
> > + skl_scaler_ecc_unmask(new_crtc_state);
> > +
> > intel_alpm_post_plane_update(state, crtc);
> >
> > intel_psr_post_plane_update(state, crtc); diff --git
> > a/drivers/gpu/drm/i915/display/intel_display_wa.c
> > b/drivers/gpu/drm/i915/display/intel_display_wa.c
> > index 399c08902413..0366eedacf2e 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_wa.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_wa.c
> > @@ -52,6 +52,17 @@ static bool
> intel_display_needs_wa_16025573575(struct intel_display *display)
> > return DISPLAY_VERx100(display) == 3000 ||
> DISPLAY_VERx100(display)
> > == 3002; }
> >
> > +/*
> > + * Wa_14011503117:
> > + * Fixes: Before enabling the scaler DE fatal error is masked
> > + * Workaround: Unmask the DE fatal error register after enabling the
> > +scaler
> > + * and after waiting of at least 1 frame.
> > + */
> > +static bool intel_display_needs_wa_14011503117(struct intel_display
> > +*display)
>
> I don't think we actually need or want to have this
> "intel_display_needs_wa_N" naming copy pasted here. Yeah, we have two like
> this already, but it was never supposed to start a scheme to follow.
>
> BR,
> Jani.
>
Sure will remove this part.
Thanks and Regards,
Nemesa
> > +{
> > + return DISPLAY_VER(display) == 13;
> > +}
> > +
> > bool __intel_display_wa(struct intel_display *display, enum
> > intel_display_wa wa, const char *name) {
> > switch (wa) {
> > @@ -59,6 +70,8 @@ bool __intel_display_wa(struct intel_display *display,
> enum intel_display_wa wa,
> > return intel_display_needs_wa_16023588340(display);
> > case INTEL_DISPLAY_WA_16025573575:
> > return intel_display_needs_wa_16025573575(display);
> > + case INTEL_DISPLAY_WA_14011503117:
> > + return intel_display_needs_wa_14011503117(display);
> > default:
> > drm_WARN(display->drm, 1, "Missing Wa number: %s\n",
> name);
> > break;
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_wa.h
> > b/drivers/gpu/drm/i915/display/intel_display_wa.h
> > index aedea4cfa3ce..abc1df83f066 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_wa.h
> > +++ b/drivers/gpu/drm/i915/display/intel_display_wa.h
> > @@ -24,6 +24,7 @@ bool intel_display_needs_wa_16023588340(struct
> > intel_display *display); enum intel_display_wa {
> > INTEL_DISPLAY_WA_16023588340,
> > INTEL_DISPLAY_WA_16025573575,
> > + INTEL_DISPLAY_WA_14011503117,
> > };
> >
> > bool __intel_display_wa(struct intel_display *display, enum
> > intel_display_wa wa, const char *name); diff --git
> > a/drivers/gpu/drm/i915/display/skl_scaler.c
> > b/drivers/gpu/drm/i915/display/skl_scaler.c
> > index 4cc55f4e1f9f..bbe84e4b71fa 100644
> > --- a/drivers/gpu/drm/i915/display/skl_scaler.c
> > +++ b/drivers/gpu/drm/i915/display/skl_scaler.c
> > @@ -762,6 +762,9 @@ void skl_pfit_enable(const struct intel_crtc_state
> *crtc_state)
> > crtc_state->scaler_state.scaler_id < 0))
> > return;
> >
> > + if (DISPLAY_VER(display) == 13)
> > + skl_scaler_ecc_mask(crtc_state);
> > +
> > drm_rect_init(&src, 0, 0,
> > drm_rect_width(&crtc_state->pipe_src) << 16,
> > drm_rect_height(&crtc_state->pipe_src) << 16); @@ -
> 938,3
> > +941,31 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state)
> > else
> > scaler_state->scaler_users &= ~(1 << SKL_CRTC_INDEX); }
> > +
> > +void skl_scaler_ecc_mask(const struct intel_crtc_state *crtc_state) {
> > + struct intel_display *display = to_intel_display(crtc_state);
> > +
> > + if (!crtc_state->pch_pfit.enabled)
> > + return;
> > +
> > + intel_de_write(display, XELPD_DISPLAY_ERR_FATAL_MASK, ~0); }
> > +
> > +void skl_scaler_ecc_unmask(const struct intel_crtc_state *crtc_state)
> > +{
> > + struct intel_display *display = to_intel_display(crtc_state);
> > + struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
> > + const struct intel_crtc_scaler_state *scaler_state =
> > + &crtc_state->scaler_state;
> > + int id;
> > +
> > + if (scaler_state)
> > + id = scaler_state->scaler_id;
> > +
> > + if (!crtc_state->pch_pfit.enabled && id == -1)
> > + return;
> > +
> > + intel_de_write_fw(display, SKL_PS_ECC_STAT(crtc->pipe, id), 1);
> > + intel_de_write(display, XELPD_DISPLAY_ERR_FATAL_MASK, 0); }
> > diff --git a/drivers/gpu/drm/i915/display/skl_scaler.h
> > b/drivers/gpu/drm/i915/display/skl_scaler.h
> > index 692716dd7616..ec0fd80a3933 100644
> > --- a/drivers/gpu/drm/i915/display/skl_scaler.h
> > +++ b/drivers/gpu/drm/i915/display/skl_scaler.h
> > @@ -44,4 +44,8 @@ skl_scaler_mode_valid(struct intel_display *display,
> > enum intel_output_format output_format,
> > int num_joined_pipes);
> >
> > +void skl_scaler_ecc_mask(const struct intel_crtc_state *crtc_state);
> > +
> > +void skl_scaler_ecc_unmask(const struct intel_crtc_state
> > +*crtc_state);
> > +
> > #endif
>
> --
> Jani Nikula, Intel
More information about the Intel-gfx
mailing list