On Thu, 07 Aug 2025, "Kandpal, Suraj" <suraj.kand...@intel.com> wrote: >> Subject: [PATCH] drm/i915/scaler: Fix for WA_14011503117 > > We already have a commit with that name don't really want many commits with > the same subject > >> >> Remove the redundant check statement. > > The is statement is not redundant just wrong will need to fix the commit > description > >> >> v2: Add scaler_id check [Jani] >> >> Fixes: 73309ed9d598 ("drm/i915/display: WA_14011503117") >> Signed-off-by: Nemesa Garg <nemesa.g...@intel.com> >> --- >> drivers/gpu/drm/i915/display/skl_scaler.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c >> b/drivers/gpu/drm/i915/display/skl_scaler.c >> index cd7ebbeb9508..6891a0b00f41 100644 >> --- a/drivers/gpu/drm/i915/display/skl_scaler.c >> +++ b/drivers/gpu/drm/i915/display/skl_scaler.c >> @@ -960,7 +960,7 @@ void adl_scaler_ecc_unmask(const struct >> intel_crtc_state *crtc_state) >> const struct intel_crtc_scaler_state *scaler_state = >> &crtc_state->scaler_state; >> >> - if (!scaler_state && scaler_state->scaler_id == -1) >> + if (scaler_state->scaler_id == -1) > > Hmm but what if scaler_state ends up being null now
It can't be NULL. > > This should have been scaler_state && scaler_state->scaler_id == > Also please add people who had bought this issue up in cc to keep them in > loop in this case that would be Jani. > It's very easy to miss fixes like this in all the mails that end up getting > sent upstream more so if they are not cc'ed > > Regards, > Suraj Kandpal >> return; >> >> intel_de_write_fw(display, >> -- >> 2.25.1 > -- Jani Nikula, Intel