[{"id":15429,"web_url":"https://patchwork.libcamera.org/comment/15429/","msgid":"","date":"2021-03-02T19:54:26","subject":"Re: [libcamera-devel] [PATCH v2 2/3] src: rkisp1: return error from\n\tipa's configure method if it fails","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Dafna,\n\nThank you for the patch.\n\nOn Thu, Feb 25, 2021 at 06:12:04PM +0100, Dafna Hirschfeld wrote:\n> The IPA of rkisp1 relay on some of the camera's controls.\n\ns/relay/relies/\n\n> Therefore it can't work if those controls are not given.\n> Return -EINVAL from 'configure' in that case.\n> Also return error from the pipeline's 'configure' method\n> if the IPA configure fails.\n> \n> Signed-off-by: Dafna Hirschfeld \n> Reviewed-by: Paul Elder \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> include/libcamera/ipa/rkisp1.mojom | 2 +-\n> src/ipa/rkisp1/rkisp1.cpp | 11 ++++++-----\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 7 +++++--\n> 3 files changed, 12 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index 9270f9c7..95fa0d93 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -31,7 +31,7 @@ interface IPARkISP1Interface {\n> \n> \tconfigure(CameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> -\t\t map entityControls) => ();\n> +\t\t map entityControls) => (int32 ret);\n> \n> \tmapBuffers(array buffers);\n> \tunmapBuffers(array ids);\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 67bac986..70e8d8f7 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -38,7 +38,7 @@ public:\n> \tint start() override { return 0; }\n> \tvoid stop() override {}\n> \n> -\tvoid configure(const CameraSensorInfo &info,\n> +\tint configure(const CameraSensorInfo &info,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls) override;\n> \tvoid mapBuffers(const std::vector &buffers) override;\n> @@ -75,25 +75,25 @@ private:\n> * assemble one. Make sure the reported sensor information are relevant\n> * before accessing them.\n> */\n> -void IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> +int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> \t\t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t\t const std::map &entityControls)\n> {\n> \tif (entityControls.empty())\n> -\t\treturn;\n> +\t\treturn -EINVAL;\n> \n> \tctrls_ = entityControls.at(0);\n> \n> \tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n> \tif (itExp == ctrls_.end()) {\n> \t\tLOG(IPARkISP1, Error) << \"Can't find exposure control\";\n> -\t\treturn;\n> +\t\treturn -EINVAL;\n> \t}\n> \n> \tconst auto itGain = ctrls_.find(V4L2_CID_ANALOGUE_GAIN);\n> \tif (itGain == ctrls_.end()) {\n> \t\tLOG(IPARkISP1, Error) << \"Can't find gain control\";\n> -\t\treturn;\n> +\t\treturn -EINVAL;\n> \t}\n> \n> \tautoExposure_ = true;\n> @@ -111,6 +111,7 @@ void IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> \t\t<< \" Gain: \" << minGain_ << \"-\" << maxGain_;\n> \n> \tsetControls(0);\n> +\treturn 0;\n> }\n> \n> void IPARkISP1::mapBuffers(const std::vector &buffers)\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 538c0139..34814f62 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -653,8 +653,11 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \tstd::map entityControls;\n> \tentityControls.emplace(0, data->sensor_->controls());\n> \n> -\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls);\n> -\n> +\tret = data->ipa_->configure(sensorInfo, streamConfig, entityControls);\n> +\tif (ret) {\n> +\t\tLOG(RkISP1, Error) << \"failed configuring IPA (\" << ret << \")\";\n> +\t\treturn ret;\n> +\t}\n> \treturn 0;\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 137FCBD808\n\tfor ;\n\tTue, 2 Mar 2021 19:54:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D533968A98;\n\tTue, 2 Mar 2021 20:54:56 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B016960106\n\tfor ;\n\tTue, 2 Mar 2021 20:54:54 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4E7FE45D;\n\tTue, 2 Mar 2021 20:54:54 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rXA8rjv4\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614714894;\n\tbh=Q2CK/MiOOWrOoaZNayHEtZQbm4VY8YE0pUDdpe5YKFk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=rXA8rjv4/GgAnTirZo5n+hb/JCow2pOCXa+NnXWjORoTYCSbKsZk0n9WT8K4tTWUL\n\tTI7ioCg1LBSKJmK6rHpBy8QbysqaCE4GGiJmnXEhBz3AveLyxtTa/zgOUZh2Z4V7TF\n\tEpBWon8noDCOJdFhFepFZ1Wb3YVRuVKpvEvrIAKU=","Date":"Tue, 2 Mar 2021 21:54:26 +0200","From":"Laurent Pinchart ","To":"Dafna Hirschfeld ","Message-ID":"","References":"<20210225171205.23341-1-dafna.hirschfeld@collabora.com>\n\t<20210225171205.23341-3-dafna.hirschfeld@collabora.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210225171205.23341-3-dafna.hirschfeld@collabora.com>","Subject":"Re: [libcamera-devel] [PATCH v2 2/3] src: rkisp1: return error from\n\tipa's configure method if it fails","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","Cc":"libcamera-devel@lists.libcamera.org, kernel@collabora.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]