Patch Detail
Show a patch.
GET /api/patches/992/?format=api
{ "id": 992, "url": "https://patchwork.libcamera.org/api/patches/992/?format=api", "web_url": "https://patchwork.libcamera.org/patch/992/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20190415165700.22970-12-laurent.pinchart@ideasonboard.com>", "date": "2019-04-15T16:57:00", "name": "[libcamera-devel,11/11] libcamera: pipeline: Add RKISP1 pipeline", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "8a807fcb851bf8c7cedd69d9fe5ea10ff4827f18", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/992/mbox/", "series": [ { "id": 250, "url": "https://patchwork.libcamera.org/api/series/250/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=250", "date": "2019-04-15T16:56:49", "name": "Rockchip ISP pipeline handler", "version": 1, "mbox": "https://patchwork.libcamera.org/series/250/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/992/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/992/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8850860DCB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Apr 2019 18:57:18 +0200 (CEST)", "from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1958CB81\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 15 Apr 2019 18:57:18 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1555347438;\n\tbh=xDOV2cq+pgHPWcXNN6HUC7P+143izrgd8HAazKxVa9o=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=mZCso7vAgK3ez9sZknOPWS8w6EnGmZ47Z/ZW+Adal5Ot8jeQjmgWEKQaKFUCv1nrT\n\twlUadw4Tt/IgCb16oHaxPey9MVgjXxXvflDyBg+n4v4ZkTygvlkKP+aJdBqCknS9rr\n\tsuK2U0cYDlzGom0P0Wc2/AvDKNDj/WMybrgki+UM=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 15 Apr 2019 19:57:00 +0300", "Message-Id": "<20190415165700.22970-12-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190415165700.22970-1-laurent.pinchart@ideasonboard.com>", "References": "<20190415165700.22970-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 11/11] libcamera: pipeline: Add RKISP1\n\tpipeline", "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": "Mon, 15 Apr 2019 16:57:20 -0000" }, "content": "The pipeline handler for the Rockchip ISP creates one camera instance\nper detected raw Bayer CSI-2 sensor. Parallel sensors and YUV sensors\nare not supported yet.\n\nAs the ISP has a single CSI-2 receiver, only one camera can be used at a\ntime. Mutual exclusion isn't implemented yet.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/pipeline/meson.build | 1 +\n src/libcamera/pipeline/rkisp1/meson.build | 3 +\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 448 ++++++++++++++++++++++\n 3 files changed, 452 insertions(+)\n create mode 100644 src/libcamera/pipeline/rkisp1/meson.build\n create mode 100644 src/libcamera/pipeline/rkisp1/rkisp1.cpp", "diff": "diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build\nindex 40bb26405b88..0d466225a72e 100644\n--- a/src/libcamera/pipeline/meson.build\n+++ b/src/libcamera/pipeline/meson.build\n@@ -4,3 +4,4 @@ libcamera_sources += files([\n ])\n \n subdir('ipu3')\n+subdir('rkisp1')\ndiff --git a/src/libcamera/pipeline/rkisp1/meson.build b/src/libcamera/pipeline/rkisp1/meson.build\nnew file mode 100644\nindex 000000000000..f1cc4046b5d0\n--- /dev/null\n+++ b/src/libcamera/pipeline/rkisp1/meson.build\n@@ -0,0 +1,3 @@\n+libcamera_sources += files([\n+ 'rkisp1.cpp',\n+])\ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nnew file mode 100644\nindex 000000000000..887c879d9024\n--- /dev/null\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -0,0 +1,448 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * rkisp1.cpp - Pipeline handler for Rockchip ISP1\n+ */\n+\n+#include <iomanip>\n+#include <memory>\n+#include <vector>\n+\n+#include <linux/media-bus-format.h>\n+\n+#include <libcamera/camera.h>\n+#include <libcamera/request.h>\n+#include <libcamera/stream.h>\n+\n+#include \"camera_sensor.h\"\n+#include \"device_enumerator.h\"\n+#include \"log.h\"\n+#include \"media_device.h\"\n+#include \"pipeline_handler.h\"\n+#include \"utils.h\"\n+#include \"v4l2_device.h\"\n+#include \"v4l2_subdevice.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(RkISP1)\n+\n+class PipelineHandlerRkISP1 : public PipelineHandler\n+{\n+public:\n+\tPipelineHandlerRkISP1(CameraManager *manager);\n+\t~PipelineHandlerRkISP1();\n+\n+\tCameraConfiguration streamConfiguration(Camera *camera,\n+\t\tconst std::vector<StreamUsage> &usages) override;\n+\tint configureStreams(Camera *camera,\n+\t\t\t const CameraConfiguration &config) override;\n+\n+\tint allocateBuffers(Camera *camera, Stream *stream) override;\n+\tint freeBuffers(Camera *camera, Stream *stream) override;\n+\n+\tint start(Camera *camera) override;\n+\tvoid stop(Camera *camera) override;\n+\n+\tint queueRequest(Camera *camera, Request *request) override;\n+\n+\tbool match(DeviceEnumerator *enumerator) override;\n+\n+private:\n+\tclass RkISP1CameraData : public CameraData\n+\t{\n+\tpublic:\n+\t\tRkISP1CameraData(PipelineHandler *pipe)\n+\t\t\t: CameraData(pipe), sensor_(nullptr)\n+\t\t{\n+\t\t}\n+\n+\t\t~RkISP1CameraData()\n+\t\t{\n+\t\t\tdelete sensor_;\n+\t\t}\n+\n+\t\tStream stream_;\n+\t\tCameraSensor *sensor_;\n+\t};\n+\n+\tstatic constexpr unsigned int RKISP1_BUFFER_COUNT = 4;\n+\n+\tRkISP1CameraData *cameraData(const Camera *camera)\n+\t{\n+\t\treturn static_cast<RkISP1CameraData *>(\n+\t\t\tPipelineHandler::cameraData(camera));\n+\t}\n+\n+\tint initLinks();\n+\tint createCamera(MediaEntity *sensor);\n+\tvoid bufferReady(Buffer *buffer);\n+\n+\tstd::shared_ptr<MediaDevice> media_;\n+\tV4L2Subdevice *dphy_;\n+\tV4L2Subdevice *isp_;\n+\tV4L2Device *video_;\n+\n+\tCamera *activeCamera_;\n+};\n+\n+PipelineHandlerRkISP1::PipelineHandlerRkISP1(CameraManager *manager)\n+\t: PipelineHandler(manager), dphy_(nullptr), isp_(nullptr),\n+\t video_(nullptr)\n+{\n+}\n+\n+PipelineHandlerRkISP1::~PipelineHandlerRkISP1()\n+{\n+\tdelete video_;\n+\tdelete isp_;\n+\tdelete dphy_;\n+\n+\tif (media_)\n+\t\tmedia_->release();\n+}\n+\n+/* -----------------------------------------------------------------------------\n+ * Pipeline Operations\n+ */\n+\n+CameraConfiguration PipelineHandlerRkISP1::streamConfiguration(Camera *camera,\n+\tconst std::vector<StreamUsage> &usages)\n+{\n+\tRkISP1CameraData *data = cameraData(camera);\n+\tCameraConfiguration configs;\n+\tStreamConfiguration config{};\n+\n+\tconst Size &resolution = data->sensor_->resolution();\n+\tconfig.width = resolution.width;\n+\tconfig.height = resolution.height;\n+\tconfig.pixelFormat = V4L2_PIX_FMT_NV12;\n+\tconfig.bufferCount = RKISP1_BUFFER_COUNT;\n+\n+\tconfigs[&data->stream_] = config;\n+\n+\tLOG(RkISP1, Debug)\n+\t\t<< \"Stream format set to \" << config.width << \"x\"\n+\t\t<< config.height << \"-0x\" << std::hex << std::setfill('0')\n+\t\t<< std::setw(8) << config.pixelFormat;\n+\n+\treturn configs;\n+}\n+\n+int PipelineHandlerRkISP1::configureStreams(Camera *camera,\n+\t\t\t\t\t const CameraConfiguration &config)\n+{\n+\tRkISP1CameraData *data = cameraData(camera);\n+\tconst StreamConfiguration &cfg = config[&data->stream_];\n+\tCameraSensor *sensor = data->sensor_;\n+\tint ret;\n+\n+\t/* Verify the configuration. */\n+\tconst Size &resolution = sensor->resolution();\n+\tif (cfg.width > resolution.width ||\n+\t cfg.height > resolution.height) {\n+\t\tLOG(RkISP1, Error)\n+\t\t\t<< \"Invalid stream size: larger than sensor resolution\";\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/*\n+\t * Configure the sensor links: enable the link corresponding to this\n+\t * camera and disable all the other sensor links.\n+\t */\n+\tconst MediaPad *pad = dphy_->entity()->getPadByIndex(0);\n+\n+\tret = media_->open();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tfor (MediaLink *link : pad->links()) {\n+\t\tbool enable = link->source()->entity() == sensor->entity();\n+\n+\t\tif (!!(link->flags() & MEDIA_LNK_FL_ENABLED) == enable)\n+\t\t\tcontinue;\n+\n+\t\tLOG(RkISP1, Debug)\n+\t\t\t<< (enable ? \"Enabling\" : \"Disabling\")\n+\t\t\t<< \" link from sensor '\"\n+\t\t\t<< link->source()->entity()->name()\n+\t\t\t<< \"' to CSI-2 receiver\";\n+\n+\t\tret = link->setEnabled(enable);\n+\t\tif (ret < 0)\n+\t\t\tbreak;\n+\t}\n+\n+\tmedia_->close();\n+\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\t/*\n+\t * Configure the format on the sensor output and propagate it through\n+\t * the pipeline.\n+\t */\n+\tV4L2SubdeviceFormat format;\n+\tformat = sensor->getFormat({ MEDIA_BUS_FMT_SBGGR12_1X12,\n+\t\t\t\t MEDIA_BUS_FMT_SGBRG12_1X12,\n+\t\t\t\t MEDIA_BUS_FMT_SGRBG12_1X12,\n+\t\t\t\t MEDIA_BUS_FMT_SRGGB12_1X12,\n+\t\t\t\t MEDIA_BUS_FMT_SBGGR10_1X10,\n+\t\t\t\t MEDIA_BUS_FMT_SGBRG10_1X10,\n+\t\t\t\t MEDIA_BUS_FMT_SGRBG10_1X10,\n+\t\t\t\t MEDIA_BUS_FMT_SRGGB10_1X10,\n+\t\t\t\t MEDIA_BUS_FMT_SBGGR8_1X8,\n+\t\t\t\t MEDIA_BUS_FMT_SGBRG8_1X8,\n+\t\t\t\t MEDIA_BUS_FMT_SGRBG8_1X8,\n+\t\t\t\t MEDIA_BUS_FMT_SRGGB8_1X8 },\n+\t\t\t\t Size(cfg.width, cfg.height));\n+\tret = sensor->setFormat(&format);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = dphy_->setFormat(0, &format);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = dphy_->getFormat(1, &format);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = isp_->setFormat(0, &format);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tV4L2DeviceFormat outputFormat = {};\n+\toutputFormat.width = cfg.width;\n+\toutputFormat.height = cfg.height;\n+\toutputFormat.fourcc = V4L2_PIX_FMT_NV12;\n+\toutputFormat.planesCount = 2;\n+\n+\tret = video_->setFormat(&outputFormat);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tLOG(RkISP1, Debug)\n+\t\t<< \"Configured pipeline for \" << format.toString() << \" -> \"\n+\t\t<< outputFormat.toString();\n+\n+\treturn 0;\n+}\n+\n+int PipelineHandlerRkISP1::allocateBuffers(Camera *camera, Stream *stream)\n+{\n+\treturn video_->exportBuffers(&stream->bufferPool());\n+}\n+\n+int PipelineHandlerRkISP1::freeBuffers(Camera *camera, Stream *stream)\n+{\n+\tif (video_->releaseBuffers())\n+\t\tLOG(RkISP1, Error) << \"Failed to release buffers\";\n+\n+\treturn 0;\n+}\n+\n+int PipelineHandlerRkISP1::start(Camera *camera)\n+{\n+\tint ret;\n+\n+\tret = video_->streamOn();\n+\tif (ret)\n+\t\tLOG(RkISP1, Error)\n+\t\t\t<< \"Failed to start camera \" << camera->name();\n+\n+\tactiveCamera_ = camera;\n+\n+\treturn ret;\n+}\n+\n+void PipelineHandlerRkISP1::stop(Camera *camera)\n+{\n+\tint ret;\n+\n+\tret = video_->streamOff();\n+\tif (ret)\n+\t\tLOG(RkISP1, Warning)\n+\t\t\t<< \"Failed to stop camera \" << camera->name();\n+\n+\tPipelineHandler::stop(camera);\n+\n+\tactiveCamera_ = nullptr;\n+}\n+\n+int PipelineHandlerRkISP1::queueRequest(Camera *camera, Request *request)\n+{\n+\tRkISP1CameraData *data = cameraData(camera);\n+\tStream *stream = &data->stream_;\n+\n+\tBuffer *buffer = request->findBuffer(stream);\n+\tif (!buffer) {\n+\t\tLOG(RkISP1, Error)\n+\t\t\t<< \"Attempt to queue request with invalid stream\";\n+\t\treturn -ENOENT;\n+\t}\n+\n+\tint ret = video_->queueBuffer(buffer);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tPipelineHandler::queueRequest(camera, request);\n+\n+\treturn 0;\n+}\n+\n+/* -----------------------------------------------------------------------------\n+ * Match and Setup\n+ */\n+\n+int PipelineHandlerRkISP1::initLinks()\n+{\n+\tMediaLink *link;\n+\tint ret;\n+\n+\tret = media_->disableLinks();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tlink = media_->link(\"rockchip-sy-mipi-dphy\", 1, \"rkisp1-isp-subdev\", 0);\n+\tif (!link)\n+\t\treturn -ENODEV;\n+\n+\tret = link->setEnabled(true);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tlink = media_->link(\"rkisp1-isp-subdev\", 2, \"rkisp1_mainpath\", 0);\n+\tif (!link)\n+\t\treturn -ENODEV;\n+\n+\tret = link->setEnabled(true);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\treturn 0;\n+}\n+\n+int PipelineHandlerRkISP1::createCamera(MediaEntity *sensor)\n+{\n+\tint ret;\n+\n+\tstd::unique_ptr<RkISP1CameraData> data =\n+\t\tutils::make_unique<RkISP1CameraData>(this);\n+\n+\tdata->sensor_ = new CameraSensor(sensor);\n+\tret = data->sensor_->init();\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tstd::set<Stream *> streams{ &data->stream_ };\n+\tstd::shared_ptr<Camera> camera =\n+\t\tCamera::create(this, sensor->name(), streams);\n+\tregisterCamera(std::move(camera), std::move(data));\n+\n+\treturn 0;\n+}\n+\n+bool PipelineHandlerRkISP1::match(DeviceEnumerator *enumerator)\n+{\n+\tint ret;\n+\n+\tDeviceMatch dm(\"rkisp1\");\n+\tdm.add(\"rkisp1-isp-subdev\");\n+\tdm.add(\"rkisp1_selfpath\");\n+\tdm.add(\"rkisp1_mainpath\");\n+\tdm.add(\"rkisp1-statistics\");\n+\tdm.add(\"rkisp1-input-params\");\n+\tdm.add(\"rockchip-sy-mipi-dphy\");\n+\n+\tmedia_ = enumerator->search(dm);\n+\tif (!media_)\n+\t\treturn false;\n+\n+\tmedia_->acquire();\n+\n+\tret = media_->open();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\t/* Create the V4L2 subdevices we will need. */\n+\tMediaEntity *dphy = media_->getEntityByName(\"rockchip-sy-mipi-dphy\");\n+\tdphy_ = new V4L2Subdevice(dphy);\n+\tret = dphy_->open();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tMediaEntity *isp = media_->getEntityByName(\"rkisp1-isp-subdev\");\n+\tisp_ = new V4L2Subdevice(isp);\n+\tret = isp_->open();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\t/* Locate and open the capture video node. */\n+\tvideo_ = new V4L2Device(media_->getEntityByName(\"rkisp1_mainpath\"));\n+\tif (video_->open())\n+\t\treturn false;\n+\n+\tvideo_->bufferReady.connect(this, &PipelineHandlerRkISP1::bufferReady);\n+\n+\t/* Configure default links. */\n+\tret = initLinks();\n+\tif (ret < 0) {\n+\t\tLOG(RkISP1, Error) << \"Failed to setup links\";\n+\t\treturn false;\n+\t}\n+\n+\t/*\n+\t * Enumerate all sensors connected to the CSI-2 receiver and create one\n+\t * camera instance for each of them.\n+\t */\n+\tconst MediaPad *pad = dphy->getPadByIndex(0);\n+\tif (!pad) {\n+\t\tret = -EINVAL;\n+\t\tgoto done;\n+\t}\n+\n+\tfor (MediaLink *link : pad->links()) {\n+\t\t/*\n+\t\t * A sensor is expected to have a single pad and expose the\n+\t\t * SENSOR function. This is overly restrictive, a better logic\n+\t\t * is needed to support sensor that expose multiple subdevs.\n+\t\t *\n+\t\t * \\todo Create a helper to identify sensors\n+\t\t */\n+\t\tMediaEntity *sensor = link->source()->entity();\n+\t\tif (!sensor)\n+\t\t\tcontinue;\n+\t\tif (sensor->pads().size() != 1)\n+\t\t\tcontinue;\n+\t\tif (sensor->function() != MEDIA_ENT_F_CAM_SENSOR)\n+\t\t\tcontinue;\n+\n+\t\tcreateCamera(sensor);\n+\t}\n+\n+done:\n+\tmedia_->close();\n+\n+\treturn ret == 0;\n+}\n+\n+/* -----------------------------------------------------------------------------\n+ * Buffer Handling\n+ */\n+\n+void PipelineHandlerRkISP1::bufferReady(Buffer *buffer)\n+{\n+\tASSERT(activeCamera_);\n+\n+\tRkISP1CameraData *data = cameraData(activeCamera_);\n+\tRequest *request = data->queuedRequests_.front();\n+\n+\tcompleteBuffer(activeCamera_, request, buffer);\n+\tcompleteRequest(activeCamera_, request);\n+}\n+\n+REGISTER_PIPELINE_HANDLER(PipelineHandlerRkISP1);\n+\n+} /* namespace libcamera */\n", "prefixes": [ "libcamera-devel", "11/11" ] }