From patchwork Tue Mar 31 16:36:34 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 26396 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 26860C32F6 for ; Tue, 31 Mar 2026 16:37:00 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AF14362D1E; Tue, 31 Mar 2026 18:36:58 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="fBjiKtJv"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C704E62D22 for ; Tue, 31 Mar 2026 18:36:51 +0200 (CEST) Received: from [100.93.44.16] (net-93-65-100-155.cust.vodafonedsl.it [93.65.100.155]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 496912451; Tue, 31 Mar 2026 18:35:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1774974929; bh=t/458MfNw43ZCbnpnbloRwKiZfi2yr4wEtFyXhslYiE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=fBjiKtJvyMFsR+lcP6irGpSVl7+vLwluN9nqlCBCHK/A6n880quOorFo121mCIIVa jRFVCg71ndZ5cHHKdcJ2jcRTVO9J4D950weTXokMs4SnilJMsEjnkOGqFtGS/9U5xg jCa4sxkx5laFQDB/yvLgRwrfP7UwCoD+TBpsxPyc= From: Jacopo Mondi Date: Tue, 31 Mar 2026 18:36:34 +0200 Subject: [PATCH v7 6/8] libcamera: mali-c55: Do not rely on bufferCount MIME-Version: 1.0 Message-Id: <20260331-mali-cru-v7-6-4caedc898a0e@ideasonboard.com> References: <20260331-mali-cru-v7-0-4caedc898a0e@ideasonboard.com> In-Reply-To: <20260331-mali-cru-v7-0-4caedc898a0e@ideasonboard.com> To: Daniel Scally , libcamera-devel@lists.libcamera.org Cc: =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= , Jacopo Mondi X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2194; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=t/458MfNw43ZCbnpnbloRwKiZfi2yr4wEtFyXhslYiE=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpy/ggskkAOY1Dw14XQ4F3ZxLM4C1pIf6MN8iMw QwSfLJX6MyJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCacv4IAAKCRByNAaPFqFW PDWVD/4vnW8QFFwzPPVUg8akvB/BW2QizhPvHsFf+RSQ9n1wwokaylcx8Ou7M2PyYQQGUmd6ovC r18byXqpo9ADdgZdb3QA34xCp8+V9kGn8R++5D0/7nkDB5w8Dm+HiwmMP3fyCc3Rg+NGQwd2GWv 5fe0j0Dmha1yOZWaLtX5HpiWHTH2w6jmRPvwMIWUiIu9ZTSwuO7ppzmll2X0IiT+FlBSrhMjBuk rH9XzEHhLJmj4kmFrFZqAZ5JrZlr7JRqHf9cV55bdR3nxwOJTUrjrW8LHcn6j9dfjYXG2f9Ju7j AsRnB+YvfLUjeCfRGzHyMtLTy58xiYG8Pes8f6+sx89qhBEh5RJcppubYuikPPef2PQsdbv66NM sR2mFn5LMh10MddV4E8m17mP3GM94AKjviOz/BiB1vNVQtGhUCYGrYoR5kTy96bY5qAFiYka3PP ZXzGWnk0YCBIAJ9/5hRFDNUKY/xD4316TtU2WP/ElEYzTGsZWCLbvJjMJ/r2TSpr0xUeJvh4NEZ zdDPQ8haosSH/QFwAWNBu+3k7tUU5oJ+cTqvUa1HfhnbKcmIyyxQbRqwwD2TeB+r+XuAmLlscFh p4VstnqM71gxQzv0hmB4lsQOq/la1z8sOUySvpQgOm8Jn/qMHC7AyhL47Jobz6/+Uy32Gfn1y+t V5THrVz+lg4uJLQ== X-Developer-Key: i=jacopo.mondi@ideasonboard.com; a=openpgp; fpr=72392EDC88144A65C701EA9BA5826A2587AD026B X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Do not rely on bufferCount for the allocation of parameters and stats buffers but add instead kMaliC55BufferCount which is also used to limit the number of in-flight requests supported by the pipeline handler. Signed-off-by: Jacopo Mondi --- src/libcamera/pipeline/mali-c55/mali-c55.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/libcamera/pipeline/mali-c55/mali-c55.cpp b/src/libcamera/pipeline/mali-c55/mali-c55.cpp index 566fa0549675..ce1f0b65cd6e 100644 --- a/src/libcamera/pipeline/mali-c55/mali-c55.cpp +++ b/src/libcamera/pipeline/mali-c55/mali-c55.cpp @@ -48,6 +48,8 @@ namespace { +static constexpr unsigned int kMaliC55BufferCount = 16; + bool isFormatRaw(const libcamera::PixelFormat &pixFmt) { return libcamera::PixelFormatInfo::info(pixFmt).colourEncoding == @@ -778,7 +780,7 @@ private: }; PipelineHandlerMaliC55::PipelineHandlerMaliC55(CameraManager *manager) - : PipelineHandler(manager), dsFitted_(true) + : PipelineHandler(manager, kMaliC55BufferCount), dsFitted_(true) { } @@ -1227,14 +1229,8 @@ int PipelineHandlerMaliC55::allocateBuffers(Camera *camera) { MaliC55CameraData *data = cameraData(camera); unsigned int ipaBufferId = 1; - unsigned int bufferCount; int ret; - bufferCount = std::max({ - data->frStream_.configuration().bufferCount, - data->dsStream_.configuration().bufferCount, - }); - auto pushBuffers = [&](const std::vector> &buffers, std::queue &queue, std::vector &ipaBuffers) { @@ -1249,14 +1245,14 @@ int PipelineHandlerMaliC55::allocateBuffers(Camera *camera) } }; - ret = stats_->allocateBuffers(bufferCount, &statsBuffers_); + ret = stats_->allocateBuffers(kMaliC55BufferCount, &statsBuffers_); if (ret < 0) return ret; pushBuffers(statsBuffers_, availableStatsBuffers_, data->ipaStatBuffers_); - ret = params_->allocateBuffers(bufferCount, ¶msBuffers_); + ret = params_->allocateBuffers(kMaliC55BufferCount, ¶msBuffers_); if (ret < 0) return ret;