Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 751,
    "url": "https://patchwork.libcamera.org/api/1.1/patches/751/?format=api",
    "web_url": "https://patchwork.libcamera.org/patch/751/",
    "project": {
        "id": 1,
        "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api",
        "name": "libcamera",
        "link_name": "libcamera",
        "list_id": "libcamera_core",
        "list_email": "libcamera-devel@lists.libcamera.org",
        "web_url": "",
        "scm_url": "",
        "webscm_url": ""
    },
    "msgid": "<20190320163055.22056-6-jacopo@jmondi.org>",
    "date": "2019-03-20T16:30:29",
    "name": "[libcamera-devel,v4,05/31] libcamera: ipu3: Initialize and configure CIO2",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": false,
    "hash": "f2f681bac3b0f98e59f2c2d62a405b7ae19b4124",
    "submitter": {
        "id": 3,
        "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api",
        "name": "Jacopo Mondi",
        "email": "jacopo@jmondi.org"
    },
    "delegate": null,
    "mbox": "https://patchwork.libcamera.org/patch/751/mbox/",
    "series": [
        {
            "id": 214,
            "url": "https://patchwork.libcamera.org/api/1.1/series/214/?format=api",
            "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=214",
            "date": "2019-03-20T16:30:24",
            "name": "libcamera: ipu3: Add ImgU support + multiple streams",
            "version": 4,
            "mbox": "https://patchwork.libcamera.org/series/214/mbox/"
        }
    ],
    "comments": "https://patchwork.libcamera.org/api/patches/751/comments/",
    "check": "pending",
    "checks": "https://patchwork.libcamera.org/api/patches/751/checks/",
    "tags": {},
    "headers": {
        "Return-Path": "<jacopo@jmondi.org>",
        "Received": [
            "from relay12.mail.gandi.net (relay12.mail.gandi.net\n\t[217.70.178.232])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 3F8C7600FC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 20 Mar 2019 17:30:31 +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 relay12.mail.gandi.net (Postfix) with ESMTPSA id BA27C200008;\n\tWed, 20 Mar 2019 16:30:30 +0000 (UTC)"
        ],
        "From": "Jacopo Mondi <jacopo@jmondi.org>",
        "To": "libcamera-devel@lists.libcamera.org",
        "Date": "Wed, 20 Mar 2019 17:30:29 +0100",
        "Message-Id": "<20190320163055.22056-6-jacopo@jmondi.org>",
        "X-Mailer": "git-send-email 2.21.0",
        "In-Reply-To": "<20190320163055.22056-1-jacopo@jmondi.org>",
        "References": "<20190320163055.22056-1-jacopo@jmondi.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[libcamera-devel] [PATCH v4 05/31] libcamera: ipu3: Initialize and\n\tconfigure CIO2",
        "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": "Wed, 20 Mar 2019 16:30:32 -0000"
    },
    "content": "Group CIO2 devices (cio2, csi2 and image sensor) in a structure\nassociated with the CameraData, to ease management and initialize it at\ncamera registration time, as a CIO2 unit will always be associated with\na Camera only.\n\nWhile at there update the IPU3 pipeline handler implementation to avoid\nname clashes.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/libcamera/pipeline/ipu3/ipu3.cpp | 301 +++++++++++++++------------\n 1 file changed, 172 insertions(+), 129 deletions(-)",
    "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 1df074553fd1..2e351d04a784 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -27,6 +27,24 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPU3)\n \n+struct CIO2Device {\n+\tCIO2Device()\n+\t\t: output(nullptr), csi2(nullptr), sensor(nullptr)\n+\t{\n+\t}\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 PipelineHandlerIPU3 : public PipelineHandler\n {\n public:\n@@ -50,33 +68,23 @@ public:\n \tbool match(DeviceEnumerator *enumerator);\n \n private:\n+\tstatic constexpr unsigned int IPU3_BUFFER_COUNT = 4;\n+\n \tclass IPU3CameraData : public CameraData\n \t{\n \tpublic:\n \t\tIPU3CameraData(PipelineHandler *pipe)\n-\t\t\t: CameraData(pipe), cio2_(nullptr), csi2_(nullptr),\n-\t\t\t  sensor_(nullptr)\n-\t\t{\n-\t\t}\n-\n-\t\t~IPU3CameraData()\n+\t\t\t: CameraData(pipe)\n \t\t{\n-\t\t\tdelete cio2_;\n-\t\t\tdelete csi2_;\n-\t\t\tdelete sensor_;\n \t\t}\n \n \t\tvoid bufferReady(Buffer *buffer);\n \n-\t\tV4L2Device *cio2_;\n-\t\tV4L2Subdevice *csi2_;\n-\t\tV4L2Subdevice *sensor_;\n+\t\tCIO2Device cio2;\n \n \t\tStream stream_;\n \t};\n \n-\tstatic constexpr unsigned int IPU3_BUFFER_COUNT = 4;\n-\n \tIPU3CameraData *cameraData(const Camera *camera)\n \t{\n \t\treturn static_cast<IPU3CameraData *>(\n@@ -85,24 +93,25 @@ private:\n \n \tint mediaBusToCIO2Format(unsigned int code);\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@@ -111,7 +120,7 @@ PipelineHandlerIPU3::streamConfiguration(Camera *camera,\n {\n \tstd::map<Stream *, StreamConfiguration> configs;\n \tIPU3CameraData *data = cameraData(camera);\n-\tV4L2Subdevice *sensor = data->sensor_;\n+\tV4L2Subdevice *sensor = data->cio2.sensor;\n \tStreamConfiguration *config = &configs[&data->stream_];\n \tunsigned int bestSize = 0;\n \n@@ -152,9 +161,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@@ -211,13 +220,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@@ -229,8 +239,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@@ -242,9 +253,10 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera, Stream *stream)\n int PipelineHandlerIPU3::start(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@@ -256,8 +268,9 @@ int PipelineHandlerIPU3::start(Camera *camera)\n void PipelineHandlerIPU3::stop(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 \tPipelineHandler::stop(camera);\n@@ -266,6 +279,7 @@ void PipelineHandlerIPU3::stop(Camera *camera)\n int PipelineHandlerIPU3::queueRequest(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@@ -275,7 +289,7 @@ int PipelineHandlerIPU3::queueRequest(Camera *camera, Request *request)\n \t\treturn -ENOENT;\n \t}\n \n-\tint ret = data->cio2_->queueBuffer(buffer);\n+\tint ret = cio2->queueBuffer(buffer);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -314,17 +328,17 @@ bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\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_ = enumerator->search(cio2_dm);\n-\tif (!cio2_)\n+\tcio2MediaDev_ = enumerator->search(cio2_dm);\n+\tif (!cio2MediaDev_)\n \t\treturn false;\n \n-\tcio2_->acquire();\n+\tcio2MediaDev_->acquire();\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-\timgu_->acquire();\n+\timguMediaDev_->acquire();\n \n \t/*\n \t * Disable all links that are enabled by default on CIO2, as camera\n@@ -333,17 +347,17 @@ 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\treturn false;\n \n-\tif (cio2_->disableLinks()) {\n-\t\tcio2_->close();\n+\tif (cio2MediaDev_->disableLinks()) {\n+\t\tcio2MediaDev_->close();\n \t\treturn false;\n \t}\n \n \tregisterCameras();\n \n-\tcio2_->close();\n+\tcio2MediaDev_->close();\n \n \treturn true;\n }\n@@ -364,6 +378,111 @@ int PipelineHandlerIPU3::mediaBusToCIO2Format(unsigned int code)\n \t}\n }\n \n+/**\n+ * \\brief Initialize components of the CIO2 device \\a index used by a camera\n+ * \\param index The CIO2 device index\n+ * \\param cio2 Pointer to the CIO2 instance\n+ *\n+ * Create and open the device and subdevices in the CIO2 instance at \\a index,\n+ * if an image sensor is connected to the CSI-2 receiver of this CIO2 instance.\n+ * Enable the media links connecting the CIO2 components to prepare for capture\n+ * operations.\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ * \\retval -EINVAL Failure to create or open a video device or subdevice\n+ * \\retval -ENODEV No image sensor is connected to this CIO2 instance\n+ */\n+int PipelineHandlerIPU3::initCIO2(unsigned int index, CIO2Device *cio2)\n+{\n+\tstd::string cio2Name = \"ipu3-cio2 \" + std::to_string(index);\n+\tstd::string csi2Name = \"ipu3-csi2 \" + std::to_string(index);\n+\tint ret;\n+\n+\t/* Verify a sensor subdevice is connected to this CIO2 instance. */\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 -EINVAL;\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, make sure it\n+\t * produces at least one image format compatible with CIO2 requirements.\n+\t *\n+\t * \\todo Define when to open and close video device nodes, as they\n+\t * might impact on power consumption.\n+\t */\n+\tcio2->sensor = new V4L2Subdevice(sensorEntity);\n+\tret = cio2->sensor->open();\n+\tif (ret) {\n+\t\tdelete cio2->sensor;\n+\n+\t\treturn ret;\n+\t}\n+\n+\tconst FormatEnum formats = cio2->sensor->formats(0);\n+\tauto it = formats.begin();\n+\tfor (; it != formats.end(); ++it) {\n+\t\tif (mediaBusToCIO2Format(it->first) != -EINVAL)\n+\t\t\tbreak;\n+\t}\n+\tif (it == formats.end()) {\n+\t\tLOG(IPU3, Info) << \"Sensor '\" << cio2->sensor->deviceName()\n+\t\t\t\t<< \"' detected, but no supported image format \"\n+\t\t\t\t<< \" found: skip camera creation\";\n+\t\tgoto error_delete_sensor;\n+\t}\n+\n+\tcio2->csi2 = new V4L2Subdevice(entity);\n+\tret = cio2->csi2->open();\n+\tif (ret)\n+\t\tgoto error_delete_csi2;\n+\n+\tentity = cio2MediaDev_->getEntityByName(cio2Name);\n+\tif (!entity) {\n+\t\tLOG(IPU3, Error)\n+\t\t\t<< \"Failed to get entity '\" << cio2Name << \"'\";\n+\t\tret = -EINVAL;\n+\t\tgoto error_delete_csi2;\n+\t}\n+\n+\tcio2->output = new V4L2Device(entity);\n+\tret = cio2->output->open();\n+\tif (ret)\n+\t\tgoto error_delete_output;\n+\n+\treturn 0;\n+\n+error_delete_output:\n+\tdelete cio2->output;\n+error_delete_csi2:\n+\tdelete cio2->csi2;\n+error_delete_sensor:\n+\tdelete cio2->sensor;\n+\n+\treturn ret;\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@@ -377,100 +496,24 @@ void PipelineHandlerIPU3::registerCameras()\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>(this);\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>(this);\n \t\tstd::set<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+\t\tint ret;\n \n-\t\t/*\n-\t\t * Make sure the sensor produces at least one image format\n-\t\t * compatible with IPU3 CIO2 requirements.\n-\t\t */\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\tconst FormatEnum formats = data->sensor_->formats(0);\n-\t\tauto it = formats.begin();\n-\t\tfor (; it != formats.end(); ++it) {\n-\t\t\tif (mediaBusToCIO2Format(it->first) != -EINVAL)\n-\t\t\t\tbreak;\n-\t\t}\n-\t\tif (it == formats.end()) {\n-\t\t\tLOG(IPU3, Info)\n-\t\t\t\t<< \"Sensor '\" << data->sensor_->deviceName()\n-\t\t\t\t<< \"' detected, but no supported image format \"\n-\t\t\t\t<< \" found: skip camera creation\";\n-\t\t\tcontinue;\n-\t\t}\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 = Camera::create(this,\n+\t\t\t\t\t\t\t\tcameraName,\n+\t\t\t\t\t\t\t\tstreams);\n \n-\t\tdata->cio2_->bufferReady.connect(data.get(),\n-\t\t\t\t\t\t &IPU3CameraData::bufferReady);\n+\t\tcio2->output->bufferReady.connect(data.get(),\n+\t\t\t\t\t\t  &IPU3CameraData::bufferReady);\n \n \t\tregisterCamera(std::move(camera), std::move(data));\n \n",
    "prefixes": [
        "libcamera-devel",
        "v4",
        "05/31"
    ]
}