]> www.infradead.org Git - users/willy/xarray.git/commitdiff
drm/i915/scaler: Fix condition for WA_14011503117
authorNemesa Garg <nemesa.garg@intel.com>
Thu, 7 Aug 2025 11:38:55 +0000 (17:08 +0530)
committerSuraj Kandpal <suraj.kandpal@intel.com>
Tue, 12 Aug 2025 03:09:18 +0000 (08:39 +0530)
As scaler_state can never be null so no need to
check this, only check if scaler_id is less
than 0 or not.

v2: Add scaler_id check [Jani]
v3: Modify commit message[Suraj]

Fixes: 73309ed9d598 ("drm/i915/display: WA_14011503117")
Signed-off-by: Nemesa Garg <nemesa.garg@intel.com>
Reviewed-by: Suraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: Suraj Kandpal <suraj.kandpal@intel.com>
Link: https://lore.kernel.org/r/20250807113855.3175435-1-nemesa.garg@intel.com
drivers/gpu/drm/i915/display/skl_scaler.c

index cd7ebbeb950841d77296e57dc11da6c86bfff053..c6cccf170ff10f13d51fa83245b89d1a4bf89247 100644 (file)
@@ -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 < 0)
                return;
 
        intel_de_write_fw(display,