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 <[email protected]> Signed-off-by: Michał Grzelak <[email protected]> Reviewed-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/i915/display/skl_scaler.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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) -- 2.45.2
