Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BBCAECD98C6 for ; Wed, 10 Jun 2026 14:21:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5003F10E9CA; Wed, 10 Jun 2026 14:21:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="hoKiwE9N"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6395910E9C8; Wed, 10 Jun 2026 14:20:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781101258; x=1812637258; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=D4abiVS944jvM2bXAA5HYuho73aPVDBx//8GyQv1D2M=; b=hoKiwE9NY9bH/YhLaVX3iWtG60U3/P5j9kvRtGb78Zu/iPezcG9PSB6F CJZvYnNFRXg5CJ5daTC47GUMphZwsxGhJcRhc6VopH3BoqyNwF9E8lxrI uFRlvndODLDXegtjCt13X/fNtX32wSHEi8eMVlbt2v9OloDeR6LRkqS5w rQk5SIRahX6C+ezyB92c/9c2A1AEI4StVE3m1Hwh3WHPfGIR3+swrsOac I3e4or/V4zaxm1Dr/sf9L+USzf8PPKqX+66gXGCrxQ23bnpK789pmifEe 7n1c2tCJ+tF8AC22z16n+eff9r7XlIYHcJrEKzh4EOPajMZAnZr/RcuKD A==; X-CSE-ConnectionGUID: GVwyWltfSEGEfhbExCbZcA== X-CSE-MsgGUID: Hlg4VMqZRdOaZx6DeNypLg== X-IronPort-AV: E=McAfee;i="6800,10657,11812"; a="85737693" X-IronPort-AV: E=Sophos;i="6.24,197,1774335600"; d="scan'208";a="85737693" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2026 07:20:58 -0700 X-CSE-ConnectionGUID: NzCNpjSxTsK+P5yM3VPRCw== X-CSE-MsgGUID: mndZM0qiQTWW8zLcddbwLw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,197,1774335600"; d="scan'208";a="246044530" Received: from fpallare-mobl4.ger.corp.intel.com (HELO localhost) ([10.245.244.3]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jun 2026 07:20:55 -0700 From: Jani Nikula To: =?utf-8?Q?Micha=C5=82?= Grzelak , intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: =?utf-8?Q?Micha=C5=82?= Grzelak , Nemesa Garg , Ville =?utf-8?B?U3lyasOkbMOk?= Subject: Re: [PATCH v1 4/9] drm/i915/scaler: move independent CASF check In-Reply-To: <20260609231217.208357-5-michal.grzelak@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs Bertel Jungin Aukio 5, 02600 Espoo, Finland References: <20260609231217.208357-1-michal.grzelak@intel.com> <20260609231217.208357-5-michal.grzelak@intel.com> Date: Wed, 10 Jun 2026 17:20:52 +0300 Message-ID: <84976148ecef740231d3655f144df8e9b942681f@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 10 Jun 2026, Micha=C5=82 Grzelak wrote: > First clause of CASF check is independent of any loop iteration and > causes intel_allocate_scaler() to fail when satisfied. Check it before > entering the loop. > > Cc: Nemesa Garg > Cc: Ville Syrj=C3=A4l=C3=A4 > Signed-off-by: Micha=C5=82 Grzelak > --- > drivers/gpu/drm/i915/display/skl_scaler.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/= i915/display/skl_scaler.c > index f2216a9ea3f8..59a5a3cd3e6a 100644 > --- a/drivers/gpu/drm/i915/display/skl_scaler.c > +++ b/drivers/gpu/drm/i915/display/skl_scaler.c > @@ -339,12 +339,14 @@ static int intel_allocate_scaler(struct intel_crtc_= scaler_state *scaler_state, > struct intel_display *display =3D to_intel_display(crtc); > int scaler_id; >=20=20 > + if (casf_scaler && !HAS_CASF(display)) > + return -1; Using -1 as magic error return value is one of my pet peeves. -1 =3D=3D -EPERM, and that's hardly the case here. I know the function returns -1 elsewhere, both should be fixed. -EINVAL is better. BR, Jani. > + > for (scaler_id =3D 0; scaler_id < crtc->num_scalers; scaler_id++) { > if (scaler_state->scalers[scaler_id].in_use) > continue; >=20=20 > - if ((casf_scaler && !HAS_CASF(display)) || > - (casf_scaler && scaler_id !=3D 1)) > + if (casf_scaler && scaler_id !=3D 1) > continue; >=20=20 > scaler_state->scalers[scaler_id].in_use =3D true; --=20 Jani Nikula, Intel