From patchwork Wed Apr 1 16:25:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 26413 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 E05F9C32F8 for ; Wed, 1 Apr 2026 16:26:11 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 25ECF62D79; Wed, 1 Apr 2026 18:26:10 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="oZzkdZRT"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B1F5C62D58 for ; Wed, 1 Apr 2026 18:26:02 +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 673561B0C; Wed, 1 Apr 2026 18:24:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1775060679; bh=L5j9uJQPSeneKNWyQ0HTWyYejmERbJhTNJMOPIbNeFY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oZzkdZRTQDHM3He3cqUd4O9Mk3WFsy1ECfDSwKVP6Z+35wY5NB8who+k+zFET7dr9 Gm0G4nbwu7srn80DGtzPH1cFBAV0NHKu/P4CryIJ6zwYUpdQURwmApNsWLlAt3v0OW bR8FyTJahJBvpfSg+iwOqTRGxtgXOh6gDjMHR6gU= From: Jacopo Mondi Date: Wed, 01 Apr 2026 18:25:55 +0200 Subject: [PATCH v8 6/8] libcamera: mali-c55: Do not rely on bufferCount MIME-Version: 1.0 Message-Id: <20260401-mali-cru-v8-6-44c48f990e28@ideasonboard.com> References: <20260401-mali-cru-v8-0-44c48f990e28@ideasonboard.com> In-Reply-To: <20260401-mali-cru-v8-0-44c48f990e28@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=2258; i=jacopo.mondi@ideasonboard.com; h=from:subject:message-id; bh=L5j9uJQPSeneKNWyQ0HTWyYejmERbJhTNJMOPIbNeFY=; b=owEBbQKS/ZANAwAKAXI0Bo8WoVY8AcsmYgBpzUcXcOJcK4dCB50aYkv8MGTOASvilB6Jdn3nO zqLtcAcUDCJAjMEAAEKAB0WIQS1xD1IgJogio9YOMByNAaPFqFWPAUCac1HFwAKCRByNAaPFqFW PDzREADEhCfnH5cC1t80/Hs/YDYe2NZ+ngKhO3IrdpNsJzte6tzs1VACcW6MJBQo/qd5V3G1DUI zJJG/mB2/IqycGKh/aa2na8AnDspiQbdCVQKNqTjvGDWb6SsBD4OKzg9SYF0f3R4ZckKbTQVrXQ IyFLO3l4XMIDu8WrXQG2SgnmcQAaKR3Z+POLdfggR1WzQu5XhB+f+8nPRgqYNtDcD2BvIIckxN+ NdAOkZd+PzZH+G/F10E5MOLNu2xRVsOFT9n4Ap3fBZ9nGhSPMuk785gIrT1oa4w8Gk8OoA69dyR 0ObiMxk8xktO1vQAmyAGSYFXbcWH5Wa8YquzhtV/Q12PS59HXAf0qWYBMBfisfT6NHiB9yykCq9 zTOQOeE1cwW0ehCuJXeeQhUU2v2naLDGWY7eUNKuwrTJ3FFFsNwIeQeQn6WCChjZZx1Ip0sewX6 0NnP46X99xN8R7u201VanPKumyH0OIiseKE+m8JEJL9y5SC3oY275QynD6T8pUza8211Yz2sLt0 mQ3FlmxzUNjGelMiu1m9z3NdehcB/v6C/HvTL+zAfKUGeQkI/V/fUDeNXgOl6z1RkUlIAB+xRUe A5wGIpwbpz2+JpuYBwUgVvUk/uubCuiUnMe36yB94FVRJ86g0xlRx8DCYchtnsaLeGazW0cYePn 57F+3d2GGIP8Yig== 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 Reviewed-by: Barnabás Pőcze --- 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..9df35585fef0 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 = 8; + 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;