Distribute negation inside scaler_has_casf() using de Morgan law resulting in (!HAS_CASF(display) || scaler_id != 1). Distribute the AND operator with casf_scaler using de Morgan law once again in order to have two OR'd clauses.
This will be used by next patches to separate and move both clauses. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 0cfa5b7564ba..f2216a9ea3f8 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -343,7 +343,8 @@ static int intel_allocate_scaler(struct intel_crtc_scaler_state *scaler_state, if (scaler_state->scalers[scaler_id].in_use) continue; - if (casf_scaler && !scaler_has_casf(display, scaler_id)) + if ((casf_scaler && !HAS_CASF(display)) || + (casf_scaler && scaler_id != 1)) continue; scaler_state->scalers[scaler_id].in_use = true; -- 2.45.2
