From: Michał Grzelak Date: Sat, 9 May 2026 16:40:48 +0000 (+0200) Subject: drm/i915/scaler: eliminate dead code X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c987f8c20946d41b9f191fdd2d7601e65e8cc120;p=thirdparty%2Fkernel%2Flinux.git drm/i915/scaler: eliminate dead code We short-cut skl_scaler_get_config() when skl_pipe_scaler_get_hw_state() has failed. Remove codepaths that assume scaler_id < 0. Cc: Nemesa Garg Signed-off-by: Michał Grzelak Reviewed-by: Ville Syrjälä Signed-off-by: Ville Syrjälä Link: https://patch.msgid.link/20260509164048.627399-10-michal.grzelak@intel.com --- diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 6acb54d5781b..7994b983d509 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -991,10 +991,7 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state) scaler_state->scalers[scaler_id].in_use = true; scaler_state->scaler_id = scaler_id; - if (scaler_id >= 0) - scaler_state->scaler_users |= (1 << SKL_CRTC_INDEX); - else - scaler_state->scaler_users &= ~(1 << SKL_CRTC_INDEX); + scaler_state->scaler_users |= (1 << SKL_CRTC_INDEX); } void adl_scaler_ecc_mask(const struct intel_crtc_state *crtc_state)