[{"id":37857,"web_url":"https://patchwork.libcamera.org/comment/37857/","msgid":"<176907342186.3882822.10485586368385995347@neptunite.rasen.tech>","date":"2026-01-22T09:17:01","subject":"Re: [PATCH v1 24/35] ipa: rkisp1: Ensure controls don't get lost","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Quoting Stefan Klug (2025-10-24 17:50:48)\n> If a request too late for controls queuing because the frame context was\n> already initialised, store the controls and apply them on the next\n> request.\n> \n> Signed-off-by: Stefan Klug \n> \n> ipa: rkisp1: Store controls on when necessary\n\nLeftovers from squash? :)\n\n> \n> Store controls for later only when necessary. Add a proper log message for that condition.\n> \n> Signed-off-by: Stefan Klug \n\nThe code looks good to me though.\n\n\nPaul\n\n> ---\n> src/ipa/rkisp1/rkisp1.cpp | 22 ++++++++++++++++++++--\n> 1 file changed, 20 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 23d80bc43c5d..b714e2f10c65 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -86,6 +86,7 @@ private:\n> std::map mappedBuffers_;\n> \n> ControlInfoMap sensorControls_;\n> + ControlList controlsToApply_;\n> \n> /* Local parameter storage */\n> struct IPAContext context_;\n> @@ -343,16 +344,33 @@ void IPARkISP1::initializeFrameContext(const uint32_t frame,\n> IPAFrameContext &frameContext,\n> const ControlList &controls)\n> {\n> - if (frameContext.initialised)\n> + if (frameContext.initialised) {\n> + if (!controls.empty()) {\n> + /* Too late to apply the controls. Store them for later. */\n> + LOG(IPARkISP1, Warning)\n> + << \"Request underrun. Controls for frame \"\n> + << frame << \" are delayed \";\n> + controlsToApply_.merge(controls,\n> + ControlList::MergePolicy::OverwriteExisting);\n> + }\n> return;\n> + }\n> +\n> + const ControlList *controls2 = &controls;\n> + if (!controlsToApply_.empty()) {\n> + controlsToApply_.merge(controls, ControlList::MergePolicy::OverwriteExisting);\n> + controls2 = &controlsToApply_;\n> + }\n> \n> frameContext.initialised = true;\n> for (auto const &a : algorithms()) {\n> Algorithm *algo = static_cast(a.get());\n> if (algo->disabled_)\n> continue;\n> - algo->queueRequest(context_, frame, frameContext, controls);\n> + algo->queueRequest(context_, frame, frameContext, *controls2);\n> }\n> +\n> + controlsToApply_.clear();\n> }\n> \n> void IPARkISP1::computeParams(const uint32_t frame, const uint32_t bufferId)\n> -- \n> 2.48.1\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1EF47BDCBF\n\tfor ;\n\tThu, 22 Jan 2026 09:17:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C9EB061FD9;\n\tThu, 22 Jan 2026 10:17:08 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CE1361FC4\n\tfor ;\n\tThu, 22 Jan 2026 10:17:08 +0100 (CET)","from neptunite.rasen.tech (unknown\n\t[IPv6:2404:7a81:160:2100:8816:a947:ebed:2ec7])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 46EB1324;\n\tThu, 22 Jan 2026 10:16:35 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"N7f7wFiB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769073395;\n\tbh=LrKcRO6Og3TXCBWKxWyB5lN2STbfePAeWq39cQiuumc=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=N7f7wFiB3y9Y5cy1P2b8Ggdl0/4eAxiBwZCVR8MI998Yb3182rGeQVif9z+AANkQz\n\t/0pcHDlzTmX0qdQAlOAb9j4nP4Cjx1GmCAeKtiyCKgsz6K6/ISqTWhRWgHfuhFMtFq\n\tsOvOL+tIUrltuo8OWdSm4MknwGLvNxpf7ZI4PXms=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20251024085130.995967-25-stefan.klug@ideasonboard.com>","References":"<20251024085130.995967-1-stefan.klug@ideasonboard.com>\n\t<20251024085130.995967-25-stefan.klug@ideasonboard.com>","Subject":"Re: [PATCH v1 24/35] ipa: rkisp1: Ensure controls don't get lost","From":"Paul Elder ","Cc":"Stefan Klug ","To":"Stefan Klug ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 22 Jan 2026 18:17:01 +0900","Message-ID":"<176907342186.3882822.10485586368385995347@neptunite.rasen.tech>","User-Agent":"alot/0.0.0","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]