From patchwork Fri Oct 24 08:50:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Klug X-Patchwork-Id: 24790 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 A5F78BE080 for ; Fri, 24 Oct 2025 08:52:51 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 634F960920; Fri, 24 Oct 2025 10:52:51 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rcQJLIbR"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C597F608C7 for ; Fri, 24 Oct 2025 10:52:49 +0200 (CEST) Received: from ideasonboard.com (unknown [IPv6:2a00:6020:448c:6c00:7edc:62f4:c118:1549]) by perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 2ADDF484E; Fri, 24 Oct 2025 10:51:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1761295864; bh=CrYhuF6fM2fE7Fad53k80vqInEOP7VuATyquavW7HVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rcQJLIbRTAiG/gvTGiYTEyBcdtnXBWTW8HfWNna8hqR5A92fjtbMKB68havIH+Sem 0g+rJ6bMEM0Fd7DjBRZZlj6ojsE0MndeI9Kn/54zPdRCTx7ulE0bPz8FODUH1JtUXG 4Bb+VqMZmAHDvrV5sLF6N/dexru/X9Oyev4PPqrA= From: Stefan Klug To: libcamera-devel@lists.libcamera.org Cc: Stefan Klug Subject: [PATCH v1 24/35] ipa: rkisp1: Ensure controls don't get lost Date: Fri, 24 Oct 2025 10:50:48 +0200 Message-ID: <20251024085130.995967-25-stefan.klug@ideasonboard.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251024085130.995967-1-stefan.klug@ideasonboard.com> References: <20251024085130.995967-1-stefan.klug@ideasonboard.com> MIME-Version: 1.0 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" If a request too late for controls queuing because the frame context was already initialised, store the controls and apply them on the next request. Signed-off-by: Stefan Klug ipa: rkisp1: Store controls on when necessary Store controls for later only when necessary. Add a proper log message for that condition. Signed-off-by: Stefan Klug --- src/ipa/rkisp1/rkisp1.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 23d80bc43c5d..b714e2f10c65 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -86,6 +86,7 @@ private: std::map mappedBuffers_; ControlInfoMap sensorControls_; + ControlList controlsToApply_; /* Local parameter storage */ struct IPAContext context_; @@ -343,16 +344,33 @@ void IPARkISP1::initializeFrameContext(const uint32_t frame, IPAFrameContext &frameContext, const ControlList &controls) { - if (frameContext.initialised) + if (frameContext.initialised) { + if (!controls.empty()) { + /* Too late to apply the controls. Store them for later. */ + LOG(IPARkISP1, Warning) + << "Request underrun. Controls for frame " + << frame << " are delayed "; + controlsToApply_.merge(controls, + ControlList::MergePolicy::OverwriteExisting); + } return; + } + + const ControlList *controls2 = &controls; + if (!controlsToApply_.empty()) { + controlsToApply_.merge(controls, ControlList::MergePolicy::OverwriteExisting); + controls2 = &controlsToApply_; + } frameContext.initialised = true; for (auto const &a : algorithms()) { Algorithm *algo = static_cast(a.get()); if (algo->disabled_) continue; - algo->queueRequest(context_, frame, frameContext, controls); + algo->queueRequest(context_, frame, frameContext, *controls2); } + + controlsToApply_.clear(); } void IPARkISP1::computeParams(const uint32_t frame, const uint32_t bufferId)