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 8558DCD8CAD for ; Tue, 9 Jun 2026 23:12:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 17B6310E683; Tue, 9 Jun 2026 23:12:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ntmp1/7K"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5884C10E683; Tue, 9 Jun 2026 23:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781046770; x=1812582770; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zazuMbNF8ARsUIfoV0FNnll96KsINTMimz7HrhJmkaI=; b=Ntmp1/7Kn8ueDratcrNXHkz2Gi901O49IF5QTcjx5irI7v9BFJXQhDdH vgVPrZE+rUzWLdUiBg8Nj5ISDG/h3AJh+zrxImDzAk8tmXEsiKyB3oQAD 6hztTVkaO68CKgHwF17uaV0cz/JfZDEKOigdJeGIbnxEY/oqyb19dha8R +ok5nGU3Kz0hnfenQ4ta8bBs+lA59vysEQm7G5qc6Ew78u1GCwQTWpsce O8Of5+c6P9B2svkIvIRnH+u0jOOud/Yze8tfcTyvdAHCmEu/m2DUXD8/k rQNmxq274CR0CnCR9lngeHU/dPuFIIC1N9LdIwJAWrEnlm3U8krB6Pij3 A==; X-CSE-ConnectionGUID: H2p6/E8NSeWpPGbYVHeetg== X-CSE-MsgGUID: yfiMvN1qRdKISOs1NTVbGw== X-IronPort-AV: E=McAfee;i="6800,10657,11812"; a="104492306" X-IronPort-AV: E=Sophos;i="6.24,196,1774335600"; d="scan'208";a="104492306" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2026 16:12:50 -0700 X-CSE-ConnectionGUID: 9s0xOSFSRByk2FsN3UIfNw== X-CSE-MsgGUID: v6P+3QNWT76/b8Rn2kpR9A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,196,1774335600"; d="scan'208";a="276187982" Received: from dev-417.igk.intel.com ([10.91.214.181]) by orviesa002.jf.intel.com with ESMTP; 09 Jun 2026 16:12:49 -0700 From: =?UTF-8?q?Micha=C5=82=20Grzelak?= To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: =?UTF-8?q?Micha=C5=82=20Grzelak?= , Nemesa Garg , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Subject: [PATCH v1 5/9] drm/i915/scaler: check CASF before allocation's loop Date: Wed, 10 Jun 2026 01:12:13 +0200 Message-ID: <20260609231217.208357-6-michal.grzelak@intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260609231217.208357-1-michal.grzelak@intel.com> References: <20260609231217.208357-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" intel_allocate_scaler() checks if casf_scaler is true and either allocates second scaler or fails if it was already allocated. Mimic this outside of the loop. Also fail the allocation if number of scalers is less than 2. Cc: Nemesa Garg Cc: Ville Syrjälä Signed-off-by: Michał Grzelak --- drivers/gpu/drm/i915/display/skl_scaler.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/display/skl_scaler.c b/drivers/gpu/drm/i915/display/skl_scaler.c index 59a5a3cd3e6a..29e4047c3f99 100644 --- a/drivers/gpu/drm/i915/display/skl_scaler.c +++ b/drivers/gpu/drm/i915/display/skl_scaler.c @@ -339,16 +339,24 @@ static int intel_allocate_scaler(struct intel_crtc_scaler_state *scaler_state, struct intel_display *display = to_intel_display(crtc); int scaler_id; - if (casf_scaler && !HAS_CASF(display)) - return -1; + 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; + + scaler_state->scalers[1].in_use = true; + return 1; + } for (scaler_id = 0; scaler_id < crtc->num_scalers; scaler_id++) { if (scaler_state->scalers[scaler_id].in_use) continue; - if (casf_scaler && scaler_id != 1) - continue; - scaler_state->scalers[scaler_id].in_use = true; return scaler_id; -- 2.45.2