[{"id":37905,"web_url":"https://patchwork.libcamera.org/comment/37905/","msgid":"<8718168a-d4ec-4827-aa2e-62a0e8343e03@ideasonboard.com>","date":"2026-01-23T12:22:03","subject":"Re: [PATCH 1/2] ipa: mali-c55: Retain Camera::controls() after\n\tipa->configure()","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/people/216/","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"content":"2026. 01. 22. 18:48 keltezéssel, Jacopo Mondi írta:\n> Similar to what commit acfd60276763 (\"ipa: rkisp1: Fix algorithm controls\n> vanish after configure\") did for the RkISP1 IPA, replace the usage of\n> unordered_map::merge() at updateControls() time with\n> unordered_map::insert().\n> \n> As unordered_map::merge moves items from the source map, it deletes\n> controls registered at algorithms initialization time in the\n> ipaContext.ctrlMap. As at configure() time updateControls() is called\n> again and the list of Camera controls is refreshed, the controls\n> registered at algorithms initialization time are lost.\n> \n> Fixes: fe989ee51498 (\"ipa: mali-c55: Add Mali-C55 ISP IPA module\")\n> Signed-off-by: Jacopo Mondi \n> ---\n\nLooks ok to me.\n\nReviewed-by: Barnabás Pőcze \n\n\n> src/ipa/mali-c55/mali-c55.cpp | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp\n> index 1d2a4f75cf8c..c626e246643b 100644\n> --- a/src/ipa/mali-c55/mali-c55.cpp\n> +++ b/src/ipa/mali-c55/mali-c55.cpp\n> @@ -264,7 +264,7 @@ void IPAMaliC55::updateControls(const IPACameraSensorInfo &sensorInfo,\n> \t * Merge in any controls that we support either statically or from the\n> \t * algorithms.\n> \t */\n> -\tctrlMap.merge(context_.ctrlMap);\n> +\tctrlMap.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());\n> \n> \t*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\n> }\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 B8998C3220\n\tfor ;\n\tFri, 23 Jan 2026 12:22:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E1B0461FC6;\n\tFri, 23 Jan 2026 13:22:07 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 815A9615B2\n\tfor ;\n\tFri, 23 Jan 2026 13:22:06 +0100 (CET)","from [192.168.33.29] (185.221.143.114.nat.pool.zt.hu\n\t[185.221.143.114])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1CCDF103D;\n\tFri, 23 Jan 2026 13:21:33 +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=\"kGwrdbHl\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769170893;\n\tbh=U36R4KiqaqR6ld6KEB3rE7IqlRQWx69+C6KXVwnnmvQ=;\n\th=Date:Subject:To:References:From:In-Reply-To:From;\n\tb=kGwrdbHli15oIgtdxcItcLt6DQNB52WCeffpLCzw6a+Thk0kasx8jhmKfMh0FeV/x\n\taMDJWev6Wie8Eh2DKs9ex4PLC5kc4BCor5RVlLVrNAjt+Khw+n4y3z66mqhp7x3BE+\n\tEZARymNLuHrSvgfUyiJ7mTAAuhOipCoBJ0oXgaDM=","Message-ID":"<8718168a-d4ec-4827-aa2e-62a0e8343e03@ideasonboard.com>","Date":"Fri, 23 Jan 2026 13:22:03 +0100","MIME-Version":"1.0","User-Agent":"Mozilla Thunderbird","Subject":"Re: [PATCH 1/2] ipa: mali-c55: Retain Camera::controls() after\n\tipa->configure()","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20260122-ipa-controls-v1-0-b8c4c345f7ae@ideasonboard.com>\n\t<20260122-ipa-controls-v1-1-b8c4c345f7ae@ideasonboard.com>","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","Content-Language":"en-US, hu-HU","In-Reply-To":"<20260122-ipa-controls-v1-1-b8c4c345f7ae@ideasonboard.com>","Content-Type":"text/plain; charset=UTF-8; format=flowed","Content-Transfer-Encoding":"8bit","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\" "}},{"id":37920,"web_url":"https://patchwork.libcamera.org/comment/37920/","msgid":"<176918199565.1693075.8537607647057987709@ping.linuxembedded.co.uk>","date":"2026-01-23T15:26:35","subject":"Re: [PATCH 1/2] ipa: mali-c55: Retain Camera::controls() after\n\tipa->configure()","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Jacopo Mondi (2026-01-22 17:48:28)\n> Similar to what commit acfd60276763 (\"ipa: rkisp1: Fix algorithm controls\n> vanish after configure\") did for the RkISP1 IPA, replace the usage of\n> unordered_map::merge() at updateControls() time with\n> unordered_map::insert().\n> \n> As unordered_map::merge moves items from the source map, it deletes\n> controls registered at algorithms initialization time in the\n> ipaContext.ctrlMap. As at configure() time updateControls() is called\n> again and the list of Camera controls is refreshed, the controls\n> registered at algorithms initialization time are lost.\n> \n> Fixes: fe989ee51498 (\"ipa: mali-c55: Add Mali-C55 ISP IPA module\")\n> Signed-off-by: Jacopo Mondi \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/ipa/mali-c55/mali-c55.cpp | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp\n> index 1d2a4f75cf8c..c626e246643b 100644\n> --- a/src/ipa/mali-c55/mali-c55.cpp\n> +++ b/src/ipa/mali-c55/mali-c55.cpp\n> @@ -264,7 +264,7 @@ void IPAMaliC55::updateControls(const IPACameraSensorInfo &sensorInfo,\n> * Merge in any controls that we support either statically or from the\n> * algorithms.\n> */\n> - ctrlMap.merge(context_.ctrlMap);\n> + ctrlMap.insert(context_.ctrlMap.begin(), context_.ctrlMap.end());\n> \n> *ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\n> }\n> \n> -- \n> 2.52.0\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 9BE8DC3220\n\tfor ;\n\tFri, 23 Jan 2026 15:26:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AA98561FC4;\n\tFri, 23 Jan 2026 16:26:39 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E3385615B2\n\tfor ;\n\tFri, 23 Jan 2026 16:26:38 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 63B7A9CE;\n\tFri, 23 Jan 2026 16:26:05 +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=\"e5qswDnS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1769181965;\n\tbh=5LwVxp+NCyj+y7VlsbNh3Q+lbKlnpCYAQvBanF47O9o=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=e5qswDnSpeezaVaxeUgovEBucWL9jUYEZbGCDdUWaXGF9+r2u5xieuBqLfDizTCl3\n\tsPvbt3Kw/UePXkyfyQHihbfk+coEZe+0fAdFVOBfzRqha2M/UFb40zX7NPfQ9briux\n\taTSur+24S3dNNhVYJOmvWvw1FVcZz17bOmoKO1vw=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20260122-ipa-controls-v1-1-b8c4c345f7ae@ideasonboard.com>","References":"<20260122-ipa-controls-v1-0-b8c4c345f7ae@ideasonboard.com>\n\t<20260122-ipa-controls-v1-1-b8c4c345f7ae@ideasonboard.com>","Subject":"Re: [PATCH 1/2] ipa: mali-c55: Retain Camera::controls() after\n\tipa->configure()","From":"Kieran Bingham ","Cc":"Jacopo Mondi ","To":"Jacopo Mondi ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 23 Jan 2026 15:26:35 +0000","Message-ID":"<176918199565.1693075.8537607647057987709@ping.linuxembedded.co.uk>","User-Agent":"alot/0.9.1","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\" "}}]