{"id":16398,"url":"https://patchwork.libcamera.org/api/patches/16398/?format=json","web_url":"https://patchwork.libcamera.org/patch/16398/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20220628082050.1934904-1-paul.elder@ideasonboard.com>","date":"2022-06-28T08:20:50","name":"[libcamera-devel] pipeline: rkisp1: Support devices without self path","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"8502e173706bd79673be7680c93da1bb5cbffc10","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16398/mbox/","series":[{"id":3226,"url":"https://patchwork.libcamera.org/api/series/3226/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3226","date":"2022-06-28T08:20:50","name":"[libcamera-devel] pipeline: rkisp1: Support devices without self path","version":1,"mbox":"https://patchwork.libcamera.org/series/3226/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16398/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16398/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 41F2FBE173\n\tfor ;\n\tTue, 28 Jun 2022 08:21:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9301B6559A;\n\tTue, 28 Jun 2022 10:21:08 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4E5F56559A\n\tfor ;\n\tTue, 28 Jun 2022 10:21:07 +0200 (CEST)","from pyrite.rasen.tech (softbank036240122163.bbtec.net\n\t[36.240.122.163])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C303F55A;\n\tTue, 28 Jun 2022 10:21:05 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656404468;\n\tbh=Rg53Xmbch1mHcJzr3EH+j2WO/BMNysz172fzVwgGhdc=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=0wkBeA9rEQ21pyuUCswipqcCMWH34X9rRIJnkBY4/Fm9iPesJRbvGZli/cTURWMkd\n\tbXdn5FW2cu98g4jnF9BTgMFC6geP/vzyOD9tl8XTQkc2V7eyoct5d5h/FLdy8/X36t\n\t3ClfP29CutPKPKBijx/AeVbKpppe6FPPZOyISGyzqzbhc52iaf/BQKbWoAZFtXkrZQ\n\t/N76iOXa+AB8+RgYzGeUf+OQWQ2pfh1ZNjrbPBEKGrBL67b2LhBKtbsEfVgr7bA/kK\n\tMeuV+7Y4r6KvrJu43sW4mLw5tlZyCQnCa5ZVuBadd8Ca1UrTny+sSdY4tU18otQFOR\n\twRM8xqwRqVDwQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656404466;\n\tbh=Rg53Xmbch1mHcJzr3EH+j2WO/BMNysz172fzVwgGhdc=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=L2FVxIU0Y2wRVPzLzi9NLoyeXi/amPBfP3+dAIrRaIk5ZBdOMb6BWSDXv8/niru2j\n\tE4KrWp35c0iogJaZoAnKD/Em23vn9wjdeuBwnbrxcw5ka47DpMEqPXU4nvk6EqTxhl\n\thZOtptXxtfeNUYpvoO7LHsmU2hV8s0HA6DhnW8Vk="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"L2FVxIU0\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 28 Jun 2022 17:20:50 +0900","Message-Id":"<20220628082050.1934904-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] pipeline: rkisp1: Support devices without\n\tself 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 7cf36524..378b4977 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -179,6 +179,8 @@ private:\n \tstd::unique_ptr param_;\n \tstd::unique_ptr stat_;\n \n+\tbool hasSelfPath_;\n+\n \tRkISP1MainPath mainPath_;\n \tRkISP1SelfPath selfPath_;\n \n@@ -343,7 +345,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@@ -382,7 +384,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@@ -392,6 +394,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@@ -402,8 +405,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@@ -420,7 +423,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@@ -499,7 +502,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@@ -516,7 +519,7 @@ CameraConfiguration *PipelineHandlerRkISP1::generateConfiguration(Camera *camera\n \t\treturn config;\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@@ -619,10 +622,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@@ -670,7 +675,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@@ -799,7 +804,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@@ -826,7 +831,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@@ -917,7 +923,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@@ -973,9 +980,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@@ -990,6 +995,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@@ -1008,11 +1015,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"]}