From mboxrd@z Thu Jan 1 00:00:00 1970 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 672CEF3ED5C for ; Sat, 11 Apr 2026 20:04:14 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C13BE10E15A; Sat, 11 Apr 2026 20:04:13 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="SqHa0XJ6"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 18FE110E15A for ; Sat, 11 Apr 2026 20:04:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775937853; x=1807473853; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=5OQMOFcityZtxsyg2zCreLFzFb5GxhXfF/xClLohtqA=; b=SqHa0XJ6FI1zHZBGqo3kiD6BKsw4FcPzFgdLBzAKC1CGOy0GDrrIcFrr O3CsXapn6GWl/+8aKszjPPyBIQ+khKjnGlCNcDbXl6QljOfZHTuqgyxT/ p02qxlNfff/lvQULT5FIY9lIOA6o4oL2b6RRHa9D/yprsxVF6mwV0FNo+ KZ0ynWtle+EkSleUU/OchBDmqlIctva8feUeJdwECLnNfJpUaJi9JRyCu +HLW/dKjnJqOEeNtdqR6sa6I+b+unx1RkoClC/QSAZfzHnA0lTVEdWj96 i/dx8cg29Z7igtekh8rSG7v9iGZQQchJgKNYxMktBByNB0jsmwFufjb3p w==; X-CSE-ConnectionGUID: c5JwCjXXS8OVFYRy2LBeFA== X-CSE-MsgGUID: AjSukZleTjSg2jqSodhj8w== X-IronPort-AV: E=McAfee;i="6800,10657,11755"; a="87553942" X-IronPort-AV: E=Sophos;i="6.23,174,1770624000"; d="scan'208";a="87553942" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2026 13:04:12 -0700 X-CSE-ConnectionGUID: yUu4QSXTTNKKixJwiL+ZVg== X-CSE-MsgGUID: 2yLi46eiRwSKccE6mzm2Qg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,174,1770624000"; d="scan'208";a="225109332" Received: from administrator-system-product-name.igk.intel.com ([10.91.214.181]) by fmviesa010.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2026 13:04:11 -0700 Date: Sat, 11 Apr 2026 22:04:09 +0200 (CEST) From: =?ISO-8859-2?Q?Micha=B3_Grzelak?= To: =?ISO-8859-15?Q?Ville_Syrj=E4l=E4?= cc: =?ISO-8859-2?Q?Micha=B3_Grzelak?= , intel-gfx@lists.freedesktop.org, Nemesa Garg Subject: Re: [PATCH v1 06/10] drm/i915/casf: remove id in favor of scaler_id In-Reply-To: Message-ID: <868b4fca-1dd4-244b-e4f7-ce298fe60a64@intel.com> References: <20260328143212.601656-1-michal.grzelak@intel.com> <20260328143212.601656-7-michal.grzelak@intel.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323329-1444149462-1775937852=:2851098" 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" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-1444149462-1775937852=:2851098 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8BIT On Fri, 10 Apr 2026, Ville Syrjälä wrote: > On Sat, Mar 28, 2026 at 03:32:08PM +0100, Michał Grzelak wrote: >> id is not really used anywhere in skl_scaler_get_config(). Replace it >> with scaler_id. >> >> Cc: Nemesa Garg >> Suggested-by: Ville Syrjälä >> Signed-off-by: Michał Grzelak >> --- >> drivers/gpu/drm/i915/display/skl_scaler.c | 9 +++------ >> 1 file changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c >> index 729ef51beeb4..5954f5beb19c 100644 >> --- a/drivers/gpu/drm/i915/display/skl_scaler.c >> +++ b/drivers/gpu/drm/i915/display/skl_scaler.c >> @@ -969,7 +969,6 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state) >> struct intel_display *display = to_intel_display(crtc_state); >> struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc); >> struct intel_crtc_scaler_state *scaler_state = &crtc_state->scaler_state; >> - int id = -1; >> int scaler_id; >> >> /* find scaler attached to this pipe */ >> @@ -980,10 +979,8 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state) >> if ((ctl & (PS_SCALER_EN | PS_BINDING_MASK)) != (PS_SCALER_EN | PS_BINDING_PIPE)) >> continue; >> >> - id = scaler_id; >> - >> /* Read CASF regs for second scaler */ >> - if (HAS_CASF(display) && id == 1) >> + if (HAS_CASF(display) && scaler_id == 1) >> intel_casf_sharpness_get_config(crtc_state); >> >> if (!crtc_state->hw.casf_params.casf_enable) >> @@ -1003,8 +1000,8 @@ void skl_scaler_get_config(struct intel_crtc_state *crtc_state) >> break; >> } >> >> - scaler_state->scaler_id = id; >> - if (id >= 0) >> + scaler_state->scaler_id = scaler_id; >> + if (scaler_id >= 0) > > We'll have scaler_id == crtc->num_scalers if the loop > didn't find a pipe scaler. So this is now a bit busted. Definitively. Should be addressed in v2. > Otherwise I think this stuff looks pretty reasonable, but it no longer > applies since my casf reorganization landed. Please rebase and repost. Thanks :) BR, Michał > >> scaler_state->scaler_users |= (1 << SKL_CRTC_INDEX); >> else >> scaler_state->scaler_users &= ~(1 << SKL_CRTC_INDEX); >> -- >> 2.45.2 > > -- > Ville Syrjälä > Intel > --8323329-1444149462-1775937852=:2851098--