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 45C91F3ED5C for ; Sat, 11 Apr 2026 17:46:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D31BD10E258; Sat, 11 Apr 2026 17:46:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="VIF5G7N7"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id CB75710E21E for ; Sat, 11 Apr 2026 17:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775929582; x=1807465582; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NpqjcaNwNhP8PmhtFv9drlgAIv1TTcwxLYnfET8yZ2M=; b=VIF5G7N7yVvV2cNOka1K2cZS+CTcZoDzmkEalTrhqcdvcFNndLJ1n5bm IzN10dP6gB87ofC0zMuhQ+IrbTg4S5EYKX1rRQmjPfHlhkl4BAaLoOz52 bpYlTF3c7UXA4JvT9CtOx0ITxCD+p26wk74R9TnrNDDD6bhHiPxyP6K4Z GSN8pLOw++rIJ7w+t2cjQoqGbEItwasULENG/lM28KQaVlARx9NEGHKAU 16/hiCkQCrq2syW9Xnu7/QtViawBTs6omrNnHHCLosPycbG1DSrWszWP7 5A6sTTmJRiTka9KG3PW4lXYLhkKmn2o+UURvI0IyFXnWg1rRFqYD1l4d+ A==; X-CSE-ConnectionGUID: T24HauBbSGOTY12vI8pZbQ== X-CSE-MsgGUID: P9ZqrEqaRK2CUKSA6aCCqA== X-IronPort-AV: E=McAfee;i="6800,10657,11755"; a="99564233" X-IronPort-AV: E=Sophos;i="6.23,173,1770624000"; d="scan'208";a="99564233" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Apr 2026 10:46:22 -0700 X-CSE-ConnectionGUID: r4UjhFiZTGSrGyRNFpfaGg== X-CSE-MsgGUID: 3o8bcap2Q9SLwNRacmQAIA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,173,1770624000"; d="scan'208";a="222899876" Received: from administrator-system-product-name.igk.intel.com (HELO dev-417.igk.intel.com) ([10.91.214.181]) by fmviesa009.fm.intel.com with ESMTP; 11 Apr 2026 10:46:20 -0700 From: =?UTF-8?q?Micha=C5=82=20Grzelak?= To: intel-gfx@lists.freedesktop.org Cc: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Nemesa Garg , =?UTF-8?q?Micha=C5=82=20Grzelak?= Subject: [PATCH v2 07/10] drm/i915/scaler: unloop scaler readout that is run once Date: Sat, 11 Apr 2026 19:45:23 +0200 Message-ID: <20260411174526.2850179-8-michal.grzelak@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260411174526.2850179-1-michal.grzelak@intel.com> References: <20260411174526.2850179-1-michal.grzelak@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 Content-Transfer-Encoding: 8bit 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" Most of the loop's code is run once because of the continue statement at it's start and break statement at it's end. Kick it out of the loop. Cc: Nemesa Garg Suggested-by: Ville Syrjälä Signed-off-by: Michał Grzelak --- drivers/gpu/drm/i915/display/skl_scaler.c | 34 ++++++++++++----------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 6d9080ec74ce0..e71d9c036a1e7 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -951,36 +951,38 @@ void skl_scaler_get_config(struct intel_crtc_state *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 scaler_id; + u32 pos, size; /* find scaler attached to this pipe */ for (scaler_id = 0; scaler_id < crtc->num_scalers; scaler_id++) { - u32 ctl, pos, size; + u32 ctl; ctl = intel_de_read(display, SKL_PS_CTRL(crtc->pipe, scaler_id)); if ((ctl & (PS_SCALER_EN | PS_BINDING_MASK)) != (PS_SCALER_EN | PS_BINDING_PIPE)) continue; - if (scaler_has_casf(display, scaler_id)) - intel_casf_sharpness_get_config(crtc_state); - - crtc_state->pch_pfit.enabled = true; - - pos = intel_de_read(display, SKL_PS_WIN_POS(crtc->pipe, scaler_id)); - size = intel_de_read(display, SKL_PS_WIN_SZ(crtc->pipe, scaler_id)); - - drm_rect_init(&crtc_state->pch_pfit.dst, - REG_FIELD_GET(PS_WIN_XPOS_MASK, pos), - REG_FIELD_GET(PS_WIN_YPOS_MASK, pos), - REG_FIELD_GET(PS_WIN_XSIZE_MASK, size), - REG_FIELD_GET(PS_WIN_YSIZE_MASK, size)); - - scaler_state->scalers[scaler_id].in_use = true; break; } if (scaler_id == crtc->num_scalers) return; + if (scaler_has_casf(display, scaler_id)) + intel_casf_sharpness_get_config(crtc_state); + + crtc_state->pch_pfit.enabled = true; + + pos = intel_de_read(display, SKL_PS_WIN_POS(crtc->pipe, scaler_id)); + size = intel_de_read(display, SKL_PS_WIN_SZ(crtc->pipe, scaler_id)); + + drm_rect_init(&crtc_state->pch_pfit.dst, + REG_FIELD_GET(PS_WIN_XPOS_MASK, pos), + REG_FIELD_GET(PS_WIN_YPOS_MASK, pos), + REG_FIELD_GET(PS_WIN_XSIZE_MASK, size), + REG_FIELD_GET(PS_WIN_YSIZE_MASK, size)); + + 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); -- 2.45.2