Patch Detail
Show a patch.
GET /api/patches/3817/?format=api
{ "id": 3817, "url": "https://patchwork.libcamera.org/api/patches/3817/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3817/", "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": "<20200519032505.17307-7-laurent.pinchart@ideasonboard.com>", "date": "2020-05-19T03:25:03", "name": "[libcamera-devel,6/8] cam: Add KMS sink class", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "7097428159e04d03bab5c573ec35668b371f8150", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": { "id": 14, "url": "https://patchwork.libcamera.org/api/users/14/?format=api", "username": "pinchartl", "first_name": "Laurent", "last_name": "Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/3817/mbox/", "series": [ { "id": 912, "url": "https://patchwork.libcamera.org/api/series/912/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=912", "date": "2020-05-19T03:24:57", "name": "libcamera: Add DRM/KMS viewfinder display to cam", "version": 1, "mbox": "https://patchwork.libcamera.org/series/912/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3817/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3817/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "Received": [ "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 CA2FA60E2A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:20 +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 66F96A1D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 May 2020 05:25:20 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"PzyQVeJB\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589858720;\n\tbh=hJfRUAq3ru0Az/WIoLLsQIJq1KuWUmXCJ594x3p2dPU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=PzyQVeJBzklx6fGbC080YZjLLDIguAPC81efJIglrzmO/ARHrj/UbN2PTgrQpUefw\n\tZ8g7Efnx5XRQQqtu6loMgF8bggdUq9uA5bwFWyPgzWUZZ9v5wi2Hhp//9XnPDU19fG\n\tSx2JmwU7Xt1jZGxNQBWE1loQ7zTqLy1KZbD/V3DU=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 19 May 2020 06:25:03 +0300", "Message-Id": "<20200519032505.17307-7-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "References": "<20200519032505.17307-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 6/8] cam: Add KMS sink class", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "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": "Tue, 19 May 2020 03:25:21 -0000" }, "content": "Add a KMSSink class to display framebuffers through the DRM/KMS API.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/cam/kms_sink.cpp | 297 +++++++++++++++++++++++++++++++++++++++++++\n src/cam/kms_sink.h | 76 +++++++++++\n src/cam/meson.build | 1 +\n 3 files changed, 374 insertions(+)\n create mode 100644 src/cam/kms_sink.cpp\n create mode 100644 src/cam/kms_sink.h", "diff": "diff --git a/src/cam/kms_sink.cpp b/src/cam/kms_sink.cpp\nnew file mode 100644\nindex 000000000000..85f244ea5413\n--- /dev/null\n+++ b/src/cam/kms_sink.cpp\n@@ -0,0 +1,297 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Ideas on Board Oy\n+ *\n+ * kms_sink.cpp - KMS Sink\n+ */\n+\n+#include \"kms_sink.h\"\n+\n+#include <algorithm>\n+#include <assert.h>\n+#include <iostream>\n+#include <memory>\n+#include <string.h>\n+\n+#include <libcamera/buffer.h>\n+#include <libcamera/camera.h>\n+#include <libcamera/stream.h>\n+\n+#include \"drm.h\"\n+\n+KMSSink::KMSSink(const std::string &connectorName)\n+\t: connector_(nullptr), crtc_(nullptr), plane_(nullptr), mode_(nullptr)\n+{\n+\tint ret = dev_.init();\n+\tif (ret < 0)\n+\t\treturn;\n+\n+\t/*\n+\t * Find the requested connector. If no connector is requested, pick the\n+\t * first connected connector.\n+\t */\n+\tfor (const DRM::Connector &conn : dev_.connectors()) {\n+\t\tif (conn.name() == connectorName) {\n+\t\t\tconnector_ = &conn;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (conn.status() != DRM::Connector::Disconnected) {\n+\t\t\tif (!connector_ ||\n+\t\t\t (connector_->status() == DRM::Connector::Unknown &&\n+\t\t\t conn.status() == DRM::Connector::Connected))\n+\t\t\t\tconnector_ = &conn;\n+\t\t}\n+\t}\n+\n+\tif (!connector_) {\n+\t\tif (!connectorName.empty())\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Connector \" << connectorName << \" not found\"\n+\t\t\t\t<< std::endl;\n+\t\telse\n+\t\t\tstd::cerr << \"No connected connector found\" << std::endl;\n+\t\treturn;\n+\t}\n+\n+\tdev_.requestComplete.connect(this, &KMSSink::requestComplete);\n+}\n+\n+void KMSSink::mapBuffer(libcamera::FrameBuffer *buffer)\n+{\n+\tstd::unique_ptr<DRM::FrameBuffer> drmBuffer =\n+\t\tdev_.createFrameBuffer(*buffer, format_, size_, stride_);\n+\tif (!drmBuffer)\n+\t\treturn;\n+\n+\tbuffers_.emplace(std::piecewise_construct,\n+\t\t\t std::forward_as_tuple(buffer),\n+\t\t\t std::forward_as_tuple(std::move(drmBuffer)));\n+}\n+\n+int KMSSink::configure(const libcamera::CameraConfiguration &config)\n+{\n+\tcrtc_ = nullptr;\n+\tplane_ = nullptr;\n+\tmode_ = nullptr;\n+\n+\tconst libcamera::StreamConfiguration &cfg = config.at(0);\n+\tint ret = configurePipeline(cfg.pixelFormat);\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tconst std::vector<DRM::Mode> &modes = connector_->modes();\n+\tconst auto iter = std::find_if(modes.begin(), modes.end(),\n+\t\t\t\t [&](const DRM::Mode &mode) {\n+\t\t\t\t\t return mode.hdisplay == cfg.size.width &&\n+\t\t\t\t\t\t mode.vdisplay == cfg.size.height;\n+\t\t\t\t });\n+\tif (iter == modes.end()) {\n+\t\tstd::cerr\n+\t\t\t<< \"No mode matching \" << cfg.size.toString()\n+\t\t\t<< std::endl;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tmode_ = &*iter;\n+\tsize_ = cfg.size;\n+\tstride_ = cfg.stride;\n+\n+\treturn 0;\n+}\n+\n+int KMSSink::configurePipeline(const libcamera::PixelFormat &format)\n+{\n+\t/*\n+\t * If the requested format has an alpha channel, also consider the X\n+\t * variant.\n+\t */\n+\tlibcamera::PixelFormat xFormat;\n+\n+\tswitch (format) {\n+\tcase DRM_FORMAT_ABGR8888:\n+\t\txFormat = libcamera::PixelFormat(DRM_FORMAT_XBGR8888);\n+\t\tbreak;\n+\tcase DRM_FORMAT_ARGB8888:\n+\t\txFormat = libcamera::PixelFormat(DRM_FORMAT_XRGB8888);\n+\t\tbreak;\n+\tcase DRM_FORMAT_BGRA8888:\n+\t\txFormat = libcamera::PixelFormat(DRM_FORMAT_BGRX8888);\n+\t\tbreak;\n+\tcase DRM_FORMAT_RGBA8888:\n+\t\txFormat = libcamera::PixelFormat(DRM_FORMAT_RGBX8888);\n+\t\tbreak;\n+\t}\n+\n+\t/*\n+\t * Find a CRTC and plane suitable for the request format and the\n+\t * connector at the end of the pipeline. Restrict the search to primary\n+\t * planes for now.\n+\t */\n+\tfor (const DRM::Encoder *encoder : connector_->encoders()) {\n+\t\tfor (const DRM::Crtc *crtc : encoder->possibleCrtcs()) {\n+\t\t\tfor (const DRM::Plane *plane : crtc->planes()) {\n+\t\t\t\tif (plane->type() != DRM::Plane::TypePrimary)\n+\t\t\t\t\tcontinue;\n+\n+\t\t\t\tif (plane->supportsFormat(format)) {\n+\t\t\t\t\tcrtc_ = crtc;\n+\t\t\t\t\tplane_ = plane;\n+\t\t\t\t\tformat_ = format;\n+\t\t\t\t\treturn 0;\n+\t\t\t\t}\n+\n+\t\t\t\tif (plane->supportsFormat(xFormat)) {\n+\t\t\t\t\tcrtc_ = crtc;\n+\t\t\t\t\tplane_ = plane;\n+\t\t\t\t\tformat_ = xFormat;\n+\t\t\t\t\treturn 0;\n+\t\t\t\t}\n+\t\t\t}\n+\t\t}\n+\t}\n+\n+\tstd::cerr\n+\t\t<< \"Unable to find display pipeline for format \"\n+\t\t<< format.toString() << std::endl;\n+\treturn -EPIPE;\n+}\n+\n+int KMSSink::start()\n+{\n+\tstd::unique_ptr<DRM::AtomicRequest> request;\n+\n+\tint ret = FrameSink::start();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\t/* Disable all CRTCs and planes to start from a known valid state. */\n+\trequest = std::make_unique<DRM::AtomicRequest>(&dev_);\n+\n+\tfor (const DRM::Crtc &crtc : dev_.crtcs())\n+\t\trequest->addProperty(&crtc, \"ACTIVE\", 0);\n+\n+\tfor (const DRM::Plane &plane : dev_.planes()) {\n+\t\trequest->addProperty(&plane, \"CRTC_ID\", 0);\n+\t\trequest->addProperty(&plane, \"FB_ID\", 0);\n+\t}\n+\n+\tret = request->commit(DRM::AtomicRequest::FlagAllowModeset);\n+\tif (ret < 0) {\n+\t\tstd::cerr\n+\t\t\t<< \"Failed to disable CRTCs and planes: \"\n+\t\t\t<< strerror(-ret) << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\t/* Enable the display pipeline with no plane to start with. */\n+\trequest = std::make_unique<DRM::AtomicRequest>(&dev_);\n+\n+\trequest->addProperty(connector_, \"CRTC_ID\", crtc_->id());\n+\trequest->addProperty(crtc_, \"ACTIVE\", 1);\n+\trequest->addProperty(crtc_, \"MODE_ID\", mode_->toBlob(&dev_));\n+\n+\tret = request->commit(DRM::AtomicRequest::FlagAllowModeset);\n+\tif (ret < 0) {\n+\t\tstd::cerr\n+\t\t\t<< \"Failed to enable display pipeline: \"\n+\t\t\t<< strerror(-ret) << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\tplaneInitialized_ = false;\n+\n+\treturn 0;\n+}\n+\n+int KMSSink::stop()\n+{\n+\t/* Display pipeline. */\n+\tDRM::AtomicRequest request(&dev_);\n+\n+\trequest.addProperty(connector_, \"CRTC_ID\", 0);\n+\trequest.addProperty(crtc_, \"ACTIVE\", 0);\n+\trequest.addProperty(crtc_, \"MODE_ID\", 0);\n+\trequest.addProperty(plane_, \"CRTC_ID\", 0);\n+\trequest.addProperty(plane_, \"FB_ID\", 0);\n+\n+\tint ret = request.commit(DRM::AtomicRequest::FlagAllowModeset);\n+\tif (ret < 0) {\n+\t\tstd::cerr\n+\t\t\t<< \"Failed to stop display pipeline: \"\n+\t\t\t<< strerror(-ret) << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\t/* Free all buffers. */\n+\tpending_.reset();\n+\tqueued_.reset();\n+\tactive_.reset();\n+\tbuffers_.clear();\n+\n+\treturn FrameSink::stop();\n+}\n+\n+bool KMSSink::consumeBuffer(const libcamera::Stream *stream,\n+\t\t\t libcamera::FrameBuffer *buffer)\n+{\n+\tif (pending_)\n+\t\treturn true;\n+\n+\tauto iter = buffers_.find(buffer);\n+\tif (iter == buffers_.end())\n+\t\treturn true;\n+\n+\tDRM::FrameBuffer *drmBuffer = iter->second.get();\n+\n+\tDRM::AtomicRequest *request = new DRM::AtomicRequest(&dev_);\n+\trequest->addProperty(plane_, \"FB_ID\", drmBuffer->id());\n+\n+\tif (!planeInitialized_) {\n+\t\trequest->addProperty(plane_, \"CRTC_ID\", crtc_->id());\n+\t\trequest->addProperty(plane_, \"SRC_X\", 0 << 16);\n+\t\trequest->addProperty(plane_, \"SRC_Y\", 0 << 16);\n+\t\trequest->addProperty(plane_, \"SRC_W\", mode_->hdisplay << 16);\n+\t\trequest->addProperty(plane_, \"SRC_H\", mode_->vdisplay << 16);\n+\t\trequest->addProperty(plane_, \"CRTC_X\", 0);\n+\t\trequest->addProperty(plane_, \"CRTC_Y\", 0);\n+\t\trequest->addProperty(plane_, \"CRTC_W\", mode_->hdisplay);\n+\t\trequest->addProperty(plane_, \"CRTC_H\", mode_->vdisplay);\n+\t\tplaneInitialized_ = true;\n+\t}\n+\n+\tpending_ = std::make_unique<Request>(request, buffer);\n+\n+\tstd::lock_guard<std::mutex> lock(lock_);\n+\n+\tif (!queued_) {\n+\t\tint ret = request->commit(DRM::AtomicRequest::FlagAsync);\n+\t\tif (ret < 0)\n+\t\t\tstd::cerr\n+\t\t\t\t<< \"Failed to commit atomic request: \"\n+\t\t\t\t<< strerror(-ret) << std::endl;\n+\t\tqueued_ = std::move(pending_);\n+\t}\n+\n+\treturn false;\n+}\n+\n+void KMSSink::requestComplete(DRM::AtomicRequest *request)\n+{\n+\tstd::lock_guard<std::mutex> lock(lock_);\n+\n+\tassert(queued_ && queued_->request_.get() == request);\n+\n+\t/* Complete the active request, if any. */\n+\tif (active_)\n+\t\tbufferReleased.emit(active_->buffer_);\n+\n+\t/* The queued request becomes active. */\n+\tactive_ = std::move(queued_);\n+\n+\t/* Queue the pending request, if any. */\n+\tif (pending_) {\n+\t\tpending_->request_->commit(DRM::AtomicRequest::FlagAsync);\n+\t\tqueued_ = std::move(pending_);\n+\t}\n+}\ndiff --git a/src/cam/kms_sink.h b/src/cam/kms_sink.h\nnew file mode 100644\nindex 000000000000..ee257a071c24\n--- /dev/null\n+++ b/src/cam/kms_sink.h\n@@ -0,0 +1,76 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Ideas on Board Oy\n+ *\n+ * kms_sink.h - KMS Sink\n+ */\n+#ifndef __CAM_KMS_SINK_H__\n+#define __CAM_KMS_SINK_H__\n+\n+#include <list>\n+#include <memory>\n+#include <mutex>\n+#include <string>\n+#include <utility>\n+\n+#include <libcamera/geometry.h>\n+#include <libcamera/pixelformats.h>\n+#include <libcamera/signal.h>\n+\n+#include \"drm.h\"\n+#include \"frame_sink.h\"\n+\n+class KMSSink : public FrameSink\n+{\n+public:\n+\tKMSSink(const std::string &connectorName);\n+\n+\tbool isValid() const { return connector_ != nullptr; }\n+\n+\tvoid mapBuffer(libcamera::FrameBuffer *buffer) override;\n+\n+\tint configure(const libcamera::CameraConfiguration &config) override;\n+\tint start() override;\n+\tint stop() override;\n+\n+\tbool consumeBuffer(const libcamera::Stream *stream,\n+\t\t\t libcamera::FrameBuffer *buffer) override;\n+\n+private:\n+\tclass Request\n+\t{\n+\tpublic:\n+\t\tRequest(DRM::AtomicRequest *request, libcamera::FrameBuffer *buffer)\n+\t\t\t: request_(request), buffer_(buffer)\n+\t\t{\n+\t\t}\n+\n+\t\tstd::unique_ptr<DRM::AtomicRequest> request_;\n+\t\tlibcamera::FrameBuffer *buffer_;\n+\t};\n+\n+\tint configurePipeline(const libcamera::PixelFormat &format);\n+\tvoid requestComplete(DRM::AtomicRequest *request);\n+\n+\tDRM::Device dev_;\n+\n+\tconst DRM::Connector *connector_;\n+\tconst DRM::Crtc *crtc_;\n+\tconst DRM::Plane *plane_;\n+\tconst DRM::Mode *mode_;\n+\n+\tlibcamera::PixelFormat format_;\n+\tlibcamera::Size size_;\n+\tunsigned int stride_;\n+\n+\tbool planeInitialized_;\n+\n+\tstd::map<libcamera::FrameBuffer *, std::unique_ptr<DRM::FrameBuffer>> buffers_;\n+\n+\tstd::mutex lock_;\n+\tstd::unique_ptr<Request> pending_;\n+\tstd::unique_ptr<Request> queued_;\n+\tstd::unique_ptr<Request> active_;\n+};\n+\n+#endif /* __CAM_KMS_SINK_H__ */\ndiff --git a/src/cam/meson.build b/src/cam/meson.build\nindex b0a8a7580dcc..55f37ed7b323 100644\n--- a/src/cam/meson.build\n+++ b/src/cam/meson.build\n@@ -18,6 +18,7 @@ if libdrm.found()\n cam_cpp_args += [ '-DHAVE_KMS' ]\n cam_sources += files([\n 'drm.cpp',\n+ 'kms_sink.cpp'\n ])\n endif\n \n", "prefixes": [ "libcamera-devel", "6/8" ] }