{"id":679,"url":"https://patchwork.libcamera.org/api/patches/679/?format=json","web_url":"https://patchwork.libcamera.org/patch/679/","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":"<20190228200410.3022-2-jacopo@jmondi.org>","date":"2019-02-28T20:04:01","name":"[libcamera-devel,01/10] libcamera: ipu3: Group CIO2 devices","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"5e5e2c29008b85aeb9f8d6e7501f8ed3bd6e5f72","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/679/mbox/","series":[{"id":199,"url":"https://patchwork.libcamera.org/api/series/199/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=199","date":"2019-02-28T20:04:00","name":"libcamera: ipu3: ImgU support","version":1,"mbox":"https://patchwork.libcamera.org/series/199/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/679/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/679/checks/","tags":{},"headers":{"Return-Path":"<jacopo@jmondi.org>","Received":["from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 271B1610BA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 28 Feb 2019 21:03:47 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id A24CCE0006;\n\tThu, 28 Feb 2019 20:03:46 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 28 Feb 2019 21:04:01 +0100","Message-Id":"<20190228200410.3022-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190228200410.3022-1-jacopo@jmondi.org>","References":"<20190228200410.3022-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 01/10] libcamera: ipu3: Group CIO2 devices","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 28 Feb 2019 20:03:47 -0000"},"content":"Group CIO2 devices (cio2, csi2 and image sensor) in a structure\nassociated with the CameraData, to ease management of the CIO2 devices.\n\nUpdate the IPU3 pipeline handler implementation to avoid name clashes\nand break-out IPU3CameraData from the pipeline handler class for\nclarity.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 251 ++++++++++++++-------------\n 1 file changed, 133 insertions(+), 118 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 9694d0ce51ab..d3f1d9a95f81 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -24,6 +24,30 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPU3)\n \n+struct Cio2Device {\n+\tCio2Device()\n+\t\t: output(nullptr), csi2(nullptr), sensor(nullptr) {}\n+\n+\t~Cio2Device()\n+\t{\n+\t\tdelete output;\n+\t\tdelete csi2;\n+\t\tdelete sensor;\n+\t}\n+\n+\tV4L2Device *output;\n+\tV4L2Subdevice *csi2;\n+\tV4L2Subdevice *sensor;\n+};\n+\n+class IPU3CameraData : public CameraData\n+{\n+public:\n+\tCio2Device cio2;\n+\n+\tStream stream_;\n+};\n+\n class PipelineHandlerIPU3 : public PipelineHandler\n {\n public:\n@@ -47,65 +71,47 @@ public:\n \tbool match(DeviceEnumerator *enumerator);\n \n private:\n-\tclass IPU3CameraData : public CameraData\n-\t{\n-\tpublic:\n-\t\tIPU3CameraData()\n-\t\t\t: cio2_(nullptr), csi2_(nullptr), sensor_(nullptr) {}\n-\n-\t\t~IPU3CameraData()\n-\t\t{\n-\t\t\tdelete cio2_;\n-\t\t\tdelete csi2_;\n-\t\t\tdelete sensor_;\n-\t\t}\n-\n-\t\tV4L2Device *cio2_;\n-\t\tV4L2Subdevice *csi2_;\n-\t\tV4L2Subdevice *sensor_;\n-\n-\t\tStream stream_;\n-\t};\n-\n \tIPU3CameraData *cameraData(const Camera *camera)\n \t{\n \t\treturn static_cast<IPU3CameraData *>(\n \t\t\tPipelineHandler::cameraData(camera));\n \t}\n \n+\tint initCio2(unsigned int index, Cio2Device *cio2);\n \tvoid registerCameras();\n \n-\tstd::shared_ptr<MediaDevice> cio2_;\n-\tstd::shared_ptr<MediaDevice> imgu_;\n+\tstd::shared_ptr<MediaDevice> cio2MediaDev_;\n+\tstd::shared_ptr<MediaDevice> imguMediaDev_;\n };\n \n PipelineHandlerIPU3::PipelineHandlerIPU3(CameraManager *manager)\n-\t: PipelineHandler(manager), cio2_(nullptr), imgu_(nullptr)\n+\t: PipelineHandler(manager), cio2MediaDev_(nullptr), imguMediaDev_(nullptr)\n {\n }\n \n PipelineHandlerIPU3::~PipelineHandlerIPU3()\n {\n-\tif (cio2_)\n-\t\tcio2_->release();\n+\tif (cio2MediaDev_)\n+\t\tcio2MediaDev_->release();\n \n-\tif (imgu_)\n-\t\timgu_->release();\n+\tif (imguMediaDev_)\n+\t\timguMediaDev_->release();\n }\n \n std::map<Stream *, StreamConfiguration>\n PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n \t\t\t\t\t std::vector<Stream *> &streams)\n {\n-\tIPU3CameraData *data = cameraData(camera);\n \tstd::map<Stream *, StreamConfiguration> configs;\n+\tIPU3CameraData *data = cameraData(camera);\n+\tV4L2Subdevice *sensor = data->cio2.sensor;\n \tV4L2SubdeviceFormat format = {};\n \n \t/*\n \t * FIXME: As of now, return the image format reported by the sensor.\n \t * In future good defaults should be provided for each stream.\n \t */\n-\tif (data->sensor_->getFormat(0, &format)) {\n+\tif (sensor->getFormat(0, &format)) {\n \t\tLOG(IPU3, Error) << \"Failed to create stream configurations\";\n \t\treturn configs;\n \t}\n@@ -126,9 +132,9 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n {\n \tIPU3CameraData *data = cameraData(camera);\n \tStreamConfiguration *cfg = &config[&data->stream_];\n-\tV4L2Subdevice *sensor = data->sensor_;\n-\tV4L2Subdevice *csi2 = data->csi2_;\n-\tV4L2Device *cio2 = data->cio2_;\n+\tV4L2Subdevice *sensor = data->cio2.sensor;\n+\tV4L2Subdevice *csi2 = data->cio2.csi2;\n+\tV4L2Device *cio2 = data->cio2.output;\n \tV4L2SubdeviceFormat subdevFormat = {};\n \tV4L2DeviceFormat devFormat = {};\n \tint ret;\n@@ -185,13 +191,14 @@ int PipelineHandlerIPU3::configureStreams(Camera *camera,\n \n int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)\n {\n-\tIPU3CameraData *data = cameraData(camera);\n \tconst StreamConfiguration &cfg = stream->configuration();\n+\tIPU3CameraData *data = cameraData(camera);\n+\tV4L2Device *cio2 = data->cio2.output;\n \n \tif (!cfg.bufferCount)\n \t\treturn -EINVAL;\n \n-\tint ret = data->cio2_->exportBuffers(&stream->bufferPool());\n+\tint ret = cio2->exportBuffers(&stream->bufferPool());\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Failed to request memory\";\n \t\treturn ret;\n@@ -203,8 +210,9 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera, Stream *stream)\n int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n {\n \tIPU3CameraData *data = cameraData(camera);\n+\tV4L2Device *cio2 = data->cio2.output;\n \n-\tint ret = data->cio2_->releaseBuffers();\n+\tint ret = cio2->releaseBuffers();\n \tif (ret) {\n \t\tLOG(IPU3, Error) << \"Failed to release memory\";\n \t\treturn ret;\n@@ -216,9 +224,10 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n int PipelineHandlerIPU3::start(const Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n+\tV4L2Device *cio2 = data->cio2.output;\n \tint ret;\n \n-\tret = data->cio2_->streamOn();\n+\tret = cio2->streamOn();\n \tif (ret) {\n \t\tLOG(IPU3, Info) << \"Failed to start camera \" << camera->name();\n \t\treturn ret;\n@@ -230,14 +239,16 @@ int PipelineHandlerIPU3::start(const Camera *camera)\n void PipelineHandlerIPU3::stop(const Camera *camera)\n {\n \tIPU3CameraData *data = cameraData(camera);\n+\tV4L2Device *cio2 = data->cio2.output;\n \n-\tif (data->cio2_->streamOff())\n+\tif (cio2->streamOff())\n \t\tLOG(IPU3, Info) << \"Failed to stop camera \" << camera->name();\n }\n \n int PipelineHandlerIPU3::queueRequest(const Camera *camera, Request *request)\n {\n \tIPU3CameraData *data = cameraData(camera);\n+\tV4L2Device *cio2 = data->cio2.output;\n \tStream *stream = &data->stream_;\n \n \tBuffer *buffer = request->findBuffer(stream);\n@@ -247,7 +258,7 @@ int PipelineHandlerIPU3::queueRequest(const Camera *camera, Request *request)\n \t\treturn -ENOENT;\n \t}\n \n-\tdata->cio2_->queueBuffer(buffer);\n+\tcio2->queueBuffer(buffer);\n \n \treturn 0;\n }\n@@ -278,20 +289,20 @@ bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n \timgu_dm.add(\"ipu3-imgu 1 viewfinder\");\n \timgu_dm.add(\"ipu3-imgu 1 3a stat\");\n \n-\tcio2_ = enumerator->search(cio2_dm);\n-\tif (!cio2_)\n+\tcio2MediaDev_ = enumerator->search(cio2_dm);\n+\tif (!cio2MediaDev_)\n \t\treturn false;\n \n-\timgu_ = enumerator->search(imgu_dm);\n-\tif (!imgu_)\n+\timguMediaDev_ = enumerator->search(imgu_dm);\n+\tif (!imguMediaDev_)\n \t\treturn false;\n \n \t/*\n \t * It is safe to acquire both media devices at this point as\n \t * DeviceEnumerator::search() skips the busy ones for us.\n \t */\n-\tcio2_->acquire();\n-\timgu_->acquire();\n+\tcio2MediaDev_->acquire();\n+\timguMediaDev_->acquire();\n \n \t/*\n \t * Disable all links that are enabled by default on CIO2, as camera\n@@ -300,28 +311,90 @@ bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n \t * Close the CIO2 media device after, as links are enabled and should\n \t * not need to be changed after.\n \t */\n-\tif (cio2_->open())\n+\tif (cio2MediaDev_->open())\n \t\tgoto error_release_mdev;\n \n-\tif (cio2_->disableLinks())\n+\tif (cio2MediaDev_->disableLinks())\n \t\tgoto error_close_cio2;\n \n \tregisterCameras();\n \n-\tcio2_->close();\n+\tcio2MediaDev_->close();\n \n \treturn true;\n \n error_close_cio2:\n-\tcio2_->close();\n+\tcio2MediaDev_->close();\n \n error_release_mdev:\n-\tcio2_->release();\n-\timgu_->release();\n+\tcio2MediaDev_->release();\n+\timguMediaDev_->release();\n \n \treturn false;\n }\n \n+int PipelineHandlerIPU3::initCio2(unsigned int index, Cio2Device *cio2)\n+{\n+\tint ret;\n+\n+\t/* Verify a sensor subdevice is connected to this CIO2 instance. */\n+\tstd::string csi2Name = \"ipu3-csi2 \" + std::to_string(index);\n+\tMediaEntity *entity = cio2MediaDev_->getEntityByName(csi2Name);\n+\tif (!entity) {\n+\t\tLOG(IPU3, Error)\n+\t\t\t<< \"Failed to get entity '\" << csi2Name << \"'\";\n+\t\treturn -ENODEV;\n+\t}\n+\n+\tconst std::vector<MediaPad *> &pads = entity->pads();\n+\tif (pads.empty())\n+\t\treturn -EINVAL;\n+\n+\t/* IPU3 CSI-2 receivers have a single sink pad at index 0. */\n+\tMediaPad *sink = pads[0];\n+\tconst std::vector<MediaLink *> &links = sink->links();\n+\tif (links.empty())\n+\t\treturn -EINVAL;\n+\n+\tMediaLink *link = links[0];\n+\tMediaEntity *sensorEntity = link->source()->entity();\n+\tif (sensorEntity->function() != MEDIA_ENT_F_CAM_SENSOR)\n+\t\treturn -ENODEV;\n+\n+\tret = link->setEnabled(true);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/*\n+\t * Now that we're sure a sensor subdevice is connected, create and open\n+\t * video devices and subdevices associated with this CIO2 unit.\n+\t */\n+\tcio2->sensor = new V4L2Subdevice(sensorEntity);\n+\tret = cio2->sensor->open();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tcio2->csi2 = new V4L2Subdevice(entity);\n+\tret = cio2->csi2->open();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tstd::string cio2Name = \"ipu3-cio2 \" + std::to_string(index);\n+\tentity = cio2MediaDev_->getEntityByName(cio2Name);\n+\tif (!entity) {\n+\t\tLOG(IPU3, Error)\n+\t\t\t<< \"Failed to get entity '\" << cio2Name << \"'\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tcio2->output = new V4L2Device(entity);\n+\tret = cio2->output->open();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n /*\n  * Cameras are created associating an image sensor (represented by a\n  * media entity with function MEDIA_ENT_F_CAM_SENSOR) to one of the four\n@@ -329,85 +402,27 @@ error_release_mdev:\n  */\n void PipelineHandlerIPU3::registerCameras()\n {\n+\tint ret;\n+\n \t/*\n \t * For each CSI-2 receiver on the IPU3, create a Camera if an\n \t * image sensor is connected to it.\n \t */\n \tunsigned int numCameras = 0;\n \tfor (unsigned int id = 0; id < 4; ++id) {\n-\t\tstd::string csi2Name = \"ipu3-csi2 \" + std::to_string(id);\n-\t\tMediaEntity *csi2 = cio2_->getEntityByName(csi2Name);\n-\t\tint ret;\n-\n-\t\t/*\n-\t\t * This shall not happen, as the device enumerator matched\n-\t\t * all entities described in the cio2_dm DeviceMatch.\n-\t\t *\n-\t\t * As this check is basically free, better stay safe than sorry.\n-\t\t */\n-\t\tif (!csi2)\n-\t\t\tcontinue;\n-\n-\t\tconst std::vector<MediaPad *> &pads = csi2->pads();\n-\t\tif (pads.empty())\n-\t\t\tcontinue;\n-\n-\t\t/* IPU3 CSI-2 receivers have a single sink pad at index 0. */\n-\t\tMediaPad *sink = pads[0];\n-\t\tconst std::vector<MediaLink *> &links = sink->links();\n-\t\tif (links.empty())\n-\t\t\tcontinue;\n-\n-\t\t/*\n-\t\t * Verify that the receiver is connected to a sensor, enable\n-\t\t * the media link between the two, and create a Camera with\n-\t\t * a unique name.\n-\t\t */\n-\t\tMediaLink *link = links[0];\n-\t\tMediaEntity *sensor = link->source()->entity();\n-\t\tif (sensor->function() != MEDIA_ENT_F_CAM_SENSOR)\n-\t\t\tcontinue;\n-\n-\t\tif (link->setEnabled(true))\n-\t\t\tcontinue;\n-\n-\t\tstd::unique_ptr<IPU3CameraData> data = utils::make_unique<IPU3CameraData>();\n-\n-\t\tstd::string cameraName = sensor->name() + \" \" + std::to_string(id);\n+\t\tstd::unique_ptr<IPU3CameraData> data =\n+\t\t\tutils::make_unique<IPU3CameraData>();\n \t\tstd::vector<Stream *> streams{ &data->stream_ };\n-\t\tstd::shared_ptr<Camera> camera = Camera::create(this, cameraName, streams);\n-\n-\t\t/*\n-\t\t * Create and open video devices and subdevices associated with\n-\t\t * the camera.\n-\t\t *\n-\t\t * If any of these operations fails, the Camera instance won't\n-\t\t * be registered. The 'camera' shared pointer and the 'data'\n-\t\t * unique pointers go out of scope and delete the objects they\n-\t\t * manage.\n-\t\t */\n-\t\tstd::string cio2Name = \"ipu3-cio2 \" + std::to_string(id);\n-\t\tMediaEntity *cio2 = cio2_->getEntityByName(cio2Name);\n-\t\tif (!cio2) {\n-\t\t\tLOG(IPU3, Error)\n-\t\t\t\t<< \"Failed to get entity '\" << cio2Name << \"'\";\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tdata->cio2_ = new V4L2Device(cio2);\n-\t\tret = data->cio2_->open();\n-\t\tif (ret)\n-\t\t\tcontinue;\n+\t\tCio2Device *cio2 = &data->cio2;\n \n-\t\tdata->sensor_ = new V4L2Subdevice(sensor);\n-\t\tret = data->sensor_->open();\n+\t\tret = initCio2(id, cio2);\n \t\tif (ret)\n \t\t\tcontinue;\n \n-\t\tdata->csi2_ = new V4L2Subdevice(csi2);\n-\t\tret = data->csi2_->open();\n-\t\tif (ret)\n-\t\t\tcontinue;\n+\t\tstd::string cameraName = cio2->sensor->deviceName() + \" \"\n+\t\t\t\t       + std::to_string(id);\n+\t\tstd::shared_ptr<Camera> camera =\n+\t\t\tCamera::create(this, cameraName, streams);\n \n \t\tsetCameraData(camera.get(), std::move(data));\n \t\tregisterCamera(std::move(camera));\n","prefixes":["libcamera-devel","01/10"]}