Combine all CASF checks into one and invert it. By doing so check when to allocate CASF instead of checking when to fail it.
Cc: Nemesa Garg <[email protected]> Cc: Ville Syrjälä <[email protected]> Signed-off-by: Michał Grzelak <[email protected]> --- drivers/gpu/drm/i915/display/skl_scaler.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 29e4047c3f99..89920954c4b3 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -340,17 +340,13 @@ static int intel_allocate_scaler(struct intel_crtc_scaler_state *scaler_state, int scaler_id; if (casf_scaler) { - if (!HAS_CASF(display)) - return -1; - - if (crtc->num_scalers < 2) - return -1; - - if (scaler_state->scalers[1].in_use) - return -1; + if (HAS_CASF(display) && crtc->num_scalers >= 2 && + !scaler_state->scalers[1].in_use) { + scaler_state->scalers[1].in_use = true; + return 1; + } - scaler_state->scalers[1].in_use = true; - return 1; + return -1; } for (scaler_id = 0; scaler_id < crtc->num_scalers; scaler_id++) { -- 2.45.2
