{"id":16399,"url":"https://patchwork.libcamera.org/api/1.1/patches/16399/?format=json","web_url":"https://patchwork.libcamera.org/patch/16399/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220628083343.1992147-1-paul.elder@ideasonboard.com>","date":"2022-06-28T08:33:43","name":"[libcamera-devel,v2] pipeline: rkisp1: Support devices without self path","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e0e1cd86ee338d02c3f03ad621229e4e7442b4ad","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16399/mbox/","series":[{"id":3227,"url":"https://patchwork.libcamera.org/api/1.1/series/3227/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3227","date":"2022-06-28T08:33:43","name":"[libcamera-devel,v2] pipeline: rkisp1: Support devices without self path","version":2,"mbox":"https://patchwork.libcamera.org/series/3227/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16399/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16399/checks/","tags":{},"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 429B8BD808\n\tfor ;\n\tTue, 28 Jun 2022 08:33:54 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95D9165637;\n\tTue, 28 Jun 2022 10:33:53 +0200 (CEST)","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 A41676559A\n\tfor ;\n\tTue, 28 Jun 2022 10:33:51 +0200 (CEST)","from pyrite.rasen.tech (softbank036240122163.bbtec.net\n\t[36.240.122.163])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3A6FC55A;\n\tTue, 28 Jun 2022 10:33:49 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656405233;\n\tbh=oT2FTzU2WITXhEetKTO3hCMCs7Rh51Nm3iY9GZUYxGs=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=E83tb7Yl9voo91FKB6bZc7jPho1jINgv/XHnA2Lp7byHr7uHEjoIZ8gUXmwKVt+Sg\n\tKh4IimWIYfl/2mzG1Y5dnE++FzI1yI6oZRWKKI7Z2/o485HWEZLJKOjgEwiyb0WkXv\n\tVYaWzKSARoxXJYdra6gOuqeyPKD0EgUhzLbmrZsvSz+Ql7PZsKIplNFEmAs5XHVKp2\n\tWTrq54C2VaT/WgC1lYE3XiUXgwEdVijIVP/yfJWt4pcVzbO5yfUIQHbo0YpI3HQt1+\n\tzaUIj1/Y0bodqTNowzR4zQxUKf5UzkIGSWylS9lMJOT3J5z2zPaVGTuN2uTIW4zbbq\n\tX5ym4eoFoifUQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656405231;\n\tbh=oT2FTzU2WITXhEetKTO3hCMCs7Rh51Nm3iY9GZUYxGs=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=PBDGwa9/uE+omOJ42A3c9PM8THoOAH8hHRSXPAZJs070RtT5hqHjC0nrM9C2Hs15y\n\tYQr7O1SnWEhrpxR0B68N0EcwDghv+NWKPj/Tf+HfbXC/dMZ4y9+XvwVCnC8dKqDSFW\n\tBjvAcA3K8sfxYxGvWOLlOGlvPZ9Ueir1wz2/YaPc="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"PBDGwa9/\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 28 Jun 2022 17:33:43 +0900","Message-Id":"<20220628083343.1992147-1-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2] pipeline: rkisp1: Support devices\n\twithout self path","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","From":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Some hardware supported by the rkisp1 driver, such as the ISP in the\ni.MX8MP, don't have a self path. Although at the moment the driver still\nexposes the self path, prepare the rkisp1 pipeline handler for when the\nself path will be removed for devices that don't support it.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- simplify matching\n- clean up self path availability in validate()\n- fix configure(), return -ENODEV if multiple roles but no self path\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 40 ++++++++++++++----------\n 1 file changed, 24 insertions(+), 16 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex a233c961..2c457f0e 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -180,6 +180,8 @@ private:\n \tstd::unique_ptr stat_;\n \tstd::unique_ptr csi_;\n \n+\tbool hasSelfPath_;\n+\n \tRkISP1MainPath mainPath_;\n \tRkISP1SelfPath selfPath_;\n \n@@ -344,7 +346,7 @@ void RkISP1CameraData::paramFilled(unsigned int frame)\n \tif (info->mainPathBuffer)\n \t\tmainPath_->queueBuffer(info->mainPathBuffer);\n \n-\tif (info->selfPathBuffer)\n+\tif (info->selfPathBuffer && selfPath_)\n \t\tselfPath_->queueBuffer(info->selfPathBuffer);\n }\n \n@@ -383,7 +385,7 @@ bool RkISP1CameraConfiguration::fitsAllPaths(const StreamConfiguration &cfg)\n \t\treturn false;\n \n \tconfig = cfg;\n-\tif (data_->selfPath_->validate(&config) != Valid)\n+\tif (data_->selfPath_ && data_->selfPath_->validate(&config) != Valid)\n \t\treturn false;\n \n \treturn true;\n@@ -393,6 +395,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n {\n \tconst CameraSensor *sensor = data_->sensor_.get();\n \tStatus status = Valid;\n+\tunsigned int pathCount = data_->selfPath_ ? 2 : 1;\n \n \tif (config_.empty())\n \t\treturn Invalid;\n@@ -403,8 +406,8 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \t}\n \n \t/* Cap the number of entries to the available streams. */\n-\tif (config_.size() > 2) {\n-\t\tconfig_.resize(2);\n+\tif (config_.size() > pathCount) {\n+\t\tconfig_.resize(pathCount);\n \t\tstatus = Adjusted;\n \t}\n \n@@ -421,7 +424,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n \t\tstd::reverse(order.begin(), order.end());\n \n \tbool mainPathAvailable = true;\n-\tbool selfPathAvailable = true;\n+\tbool selfPathAvailable = (pathCount == 2);\n \tfor (unsigned int index : order) {\n \t\tStreamConfiguration &cfg = config_[index];\n \n@@ -500,7 +503,7 @@ CameraConfiguration::Status RkISP1CameraConfiguration::validate()\n }\n \n PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n-\t: PipelineHandler(manager)\n+\t: PipelineHandler(manager), hasSelfPath_(true)\n {\n }\n \n@@ -527,7 +530,7 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n \t}\n \n \tbool mainPathAvailable = true;\n-\tbool selfPathAvailable = true;\n+\tbool selfPathAvailable = data->selfPath_;\n \tfor (const StreamRole role : roles) {\n \t\tbool useMainPath;\n \n@@ -636,10 +639,12 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n \t\t\tret = mainPath_.configure(cfg, format);\n \t\t\tstreamConfig[0] = IPAStream(cfg.pixelFormat,\n \t\t\t\t\t\t cfg.size);\n-\t\t} else {\n+\t\t} else if (hasSelfPath_) {\n \t\t\tret = selfPath_.configure(cfg, format);\n \t\t\tstreamConfig[1] = IPAStream(cfg.pixelFormat,\n \t\t\t\t\t\t cfg.size);\n+\t\t} else {\n+\t\t\treturn -ENODEV;\n \t\t}\n \n \t\tif (ret)\n@@ -687,7 +692,7 @@ int PipelineHandlerRkISP1::exportFrameBuffers([[maybe_unused]] Camera *camera, S\n \n \tif (stream == &data->mainPathStream_)\n \t\treturn mainPath_.exportBuffers(count, buffers);\n-\telse if (stream == &data->selfPathStream_)\n+\telse if (hasSelfPath_ && stream == &data->selfPathStream_)\n \t\treturn selfPath_.exportBuffers(count, buffers);\n \n \treturn -EINVAL;\n@@ -816,7 +821,7 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL\n \t\t}\n \t}\n \n-\tif (data->selfPath_->isEnabled()) {\n+\tif (hasSelfPath_ && data->selfPath_->isEnabled()) {\n \t\tret = selfPath_.start();\n \t\tif (ret) {\n \t\t\tmainPath_.stop();\n@@ -843,7 +848,8 @@ void PipelineHandlerRkISP1::stopDevice(Camera *camera)\n \n \tdata->ipa_->stop();\n \n-\tselfPath_.stop();\n+\tif (hasSelfPath_)\n+\t\tselfPath_.stop();\n \tmainPath_.stop();\n \n \tret = stat_->streamOff();\n@@ -946,7 +952,8 @@ int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n \tint ret;\n \n \tstd::unique_ptr data =\n-\t\tstd::make_unique(this, &mainPath_, &selfPath_);\n+\t\tstd::make_unique(this, &mainPath_,\n+\t\t\t\t\t\t hasSelfPath_ ? &selfPath_ : nullptr);\n \n \tControlInfoMap::Map ctrls;\n \tctrls.emplace(std::piecewise_construct,\n@@ -1002,9 +1009,7 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \n \tDeviceMatch dm(\"rkisp1\");\n \tdm.add(\"rkisp1_isp\");\n-\tdm.add(\"rkisp1_resizer_selfpath\");\n \tdm.add(\"rkisp1_resizer_mainpath\");\n-\tdm.add(\"rkisp1_selfpath\");\n \tdm.add(\"rkisp1_mainpath\");\n \tdm.add(\"rkisp1_stats\");\n \tdm.add(\"rkisp1_params\");\n@@ -1019,6 +1024,8 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \t\treturn false;\n \t}\n \n+\thasSelfPath_ = !!media_->getEntityByName(\"rkisp1_selfpath\");\n+\n \t/* Create the V4L2 subdevices we will need. */\n \tisp_ = V4L2Subdevice::fromEntityName(media_, \"rkisp1_isp\");\n \tif (isp_->open() < 0)\n@@ -1049,11 +1056,12 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tif (!mainPath_.init(media_))\n \t\treturn false;\n \n-\tif (!selfPath_.init(media_))\n+\tif (hasSelfPath_ && !selfPath_.init(media_))\n \t\treturn false;\n \n \tmainPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n-\tselfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n+\tif (hasSelfPath_)\n+\t\tselfPath_.bufferReady().connect(this, &PipelineHandlerRkISP1::bufferReady);\n \tstat_->bufferReady.connect(this, &PipelineHandlerRkISP1::statReady);\n \tparam_->bufferReady.connect(this, &PipelineHandlerRkISP1::paramReady);\n \n","prefixes":["libcamera-devel","v2"]}