{"id":16375,"url":"https://patchwork.libcamera.org/api/1.1/patches/16375/?format=json","web_url":"https://patchwork.libcamera.org/patch/16375/","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":"<20220627110859.1543239-1-paul.elder@ideasonboard.com>","date":"2022-06-27T11:08:59","name":"[libcamera-devel] pipeline: rkisp1: Support devices without self path","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"672aa9d4a950834532314deee4bd383da01a1b28","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/16375/mbox/","series":[{"id":3221,"url":"https://patchwork.libcamera.org/api/1.1/series/3221/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3221","date":"2022-06-27T11:08:59","name":"[libcamera-devel] pipeline: rkisp1: Support devices without self path","version":1,"mbox":"https://patchwork.libcamera.org/series/3221/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16375/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16375/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 62A57BD808\n\tfor ;\n\tMon, 27 Jun 2022 11:09:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9AB9665635;\n\tMon, 27 Jun 2022 13:09:12 +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 B14496059B\n\tfor ;\n\tMon, 27 Jun 2022 13:09:10 +0200 (CEST)","from pyrite.rasen.tech (softbank036240122163.bbtec.net\n\t[36.240.122.163])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id CC7181C82;\n\tMon, 27 Jun 2022 13:09:08 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1656328152;\n\tbh=6xLBxlDgJvofa4MhvixDdcTqu0BhScXstH8fWKc6MwI=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=Fo9YFRU2J6CXfBJ9lPRQMthi3DK90Fllo3zG1uiMJ+98DDh/6fGeRgAf4jWqResKK\n\tjMknhgY2Fcf7gx438DW+QAUjH3xl0H77v5ff/soqGltkNHy8Uqtcc3EKIj3MWBEW9R\n\tFbXVs4RB8juQys/HQRtzpoIQxiAnOUYtDigdGaio8hvc+0epyOjum1AD3IKgXNPqDF\n\tLIlktl45DJcm/AS7bMbKTXPkHaUpbw7KO4B0ZA9rjjudSKl+NwQrZhczuozgB4UDXR\n\t3WlwLsJYTg+vOPBdNo5LkuSQdoMG2PRsOcs0SIgZBsm9/gRyO54A1RDgoK7OUZjgHI\n\tVczGRFab6HNsQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1656328150;\n\tbh=6xLBxlDgJvofa4MhvixDdcTqu0BhScXstH8fWKc6MwI=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=H6zii/UhP1Un8YN6HQEU13MDS9HCR9hyZN71Eu/SYN6ztTYtY/cak0vINdZdf2eBz\n\t2uT9STIVjZoWGP7PHButjpACw8dI56gL46+25QG7KRyYkW1kGQZuzO5qXn5N2V7i6p\n\tMQ0dq+cr75mw9aMZWLewHFGbWhB50JupNvczNkHk="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"H6zii/Uh\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 27 Jun 2022 20:08:59 +0900","Message-Id":"<20220627110859.1543239-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 src/libcamera/pipeline/rkisp1/rkisp1.cpp | 45 ++++++++++++++++--------\n 1 file changed, 31 insertions(+), 14 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 7cf36524..83977fbc 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@@ -420,7 +422,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 = data_->selfPath_;\n \tfor (unsigned int index : order) {\n \t\tStreamConfiguration &cfg = config_[index];\n \n@@ -499,7 +501,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 +518,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,7 +621,7 @@ 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@@ -670,7 +672,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 +801,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 +828,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 +920,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@@ -980,9 +984,21 @@ bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n \tdm.add(\"rkisp1_stats\");\n \tdm.add(\"rkisp1_params\");\n \n+\tDeviceMatch dmNoSelf(\"rkisp1\");\n+\tdmNoSelf.add(\"rkisp1_isp\");\n+\tdmNoSelf.add(\"rkisp1_resizer_mainpath\");\n+\tdmNoSelf.add(\"rkisp1_mainpath\");\n+\tdmNoSelf.add(\"rkisp1_stats\");\n+\tdmNoSelf.add(\"rkisp1_params\");\n+\n \tmedia_ = acquireMediaDevice(enumerator, dm);\n-\tif (!media_)\n-\t\treturn false;\n+\tif (!media_) {\n+\t\tmedia_ = acquireMediaDevice(enumerator, dmNoSelf);\n+\t\tif (!media_)\n+\t\t\treturn false;\n+\n+\t\thasSelfPath_ = false;\n+\t}\n \n \tif (!media_->hwRevision()) {\n \t\tLOG(RkISP1, Error)\n@@ -1008,11 +1024,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"]}