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 <nemesa.garg@intel.com>
Signed-off-by: Michał Grzelak <michal.grzelak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
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 6acb54d5781b0dfba7a849c26ba36da4a221569c..7994b983d509d153763997de56d6115462bc8f72 100644 (file)
--- 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)