Patch Detail
Show a patch.
GET /api/1.1/patches/19759/?format=api
{ "id": 19759, "url": "https://patchwork.libcamera.org/api/1.1/patches/19759/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19759/", "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": "<20240319123622.675599-3-mzamazal@redhat.com>", "date": "2024-03-19T12:35:49", "name": "[v6,02/18] libcamera: internal: Move dma_heaps.[h, cpp] to common directories", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "e78e24d04cb9983c5794f9a6d634d04c3ba0a2b0", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19759/mbox/", "series": [ { "id": 4231, "url": "https://patchwork.libcamera.org/api/1.1/series/4231/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4231", "date": "2024-03-19T12:35:47", "name": "libcamera: introduce Software ISP and Software IPA", "version": 6, "mbox": "https://patchwork.libcamera.org/series/4231/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19759/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19759/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 15B7EC3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 19 Mar 2024 12:37:12 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AF58E62D27;\n\tTue, 19 Mar 2024 13:37:11 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6D8D662CA8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 19 Mar 2024 13:37:09 +0100 (CET)", "from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-137-cMMIxN91OaCB3M0nNTVzmg-1;\n\tTue, 19 Mar 2024 08:37:03 -0400", "from smtp.corp.redhat.com\n\t(int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EDD528C97CE;\n\tTue, 19 Mar 2024 12:37:03 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.226.119])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id C5C451C060A4;\n\tTue, 19 Mar 2024 12:37:00 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"VJLGpmgl\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1710851828;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=tkDNprHAzAHddTuspjiNlu8IWrLfm/Y53ZcpYrntM8E=;\n\tb=VJLGpmglGffCeGTKKlP/aTx2o8dbe2w5a0MBNapeUTg87A8YqGKNVybKsfFFVa3FlHaBYy\n\t9rFxZoAQywRUBdmfbQIxq0DVhG0zT3eTelEHbNUxqjn+xd0B/Rc3ADjsQ7NS0r6ApA/FRD\n\tFGOX4OS2TK/DMBg3M61Or4R16Pqqs8E=", "X-MC-Unique": "cMMIxN91OaCB3M0nNTVzmg-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Andrey Konovalov <andrey.konovalov@linaro.org>,\n\tAndrey Konovalov <andrey.konovalov.ynk@gmail.com>,\n\tBryan O'Donoghue <bryan.odonoghue@linaro.org>,\n\tMaxime Ripard <mripard@redhat.com>, Milan Zamazal <mzamazal@redhat.com>, \n\tPavel Machek <pavel@ucw.cz>, Hans de Goede <hdegoede@redhat.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tNaushir Patuck <naush@raspberrypi.com>", "Subject": "[PATCH v6 02/18] libcamera: internal: Move dma_heaps.[h,\n\tcpp] to common directories", "Date": "Tue, 19 Mar 2024 13:35:49 +0100", "Message-ID": "<20240319123622.675599-3-mzamazal@redhat.com>", "In-Reply-To": "<20240319123622.675599-1-mzamazal@redhat.com>", "References": "<20240319123622.675599-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.7", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Andrey Konovalov <andrey.konovalov@linaro.org>\n\nDmaHeap class is useful outside the RPi pipeline handler too.\n\nMove dma_heaps.h and dma_heaps.cpp to common directories. Update\nthe build files and RPi vc4 pipeline handler accordingly.\n\nTested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s\nTested-by: Pavel Machek <pavel@ucw.cz>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Pavel Machek <pavel@ucw.cz>\nSigned-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>\nSigned-off-by: Hans de Goede <hdegoede@redhat.com>\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../libcamera/internal}/dma_heaps.h | 4 -\n include/libcamera/internal/meson.build | 1 +\n src/libcamera/dma_heaps.cpp | 127 ++++++++++++++++++\n src/libcamera/meson.build | 1 +\n src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp | 90 -------------\n src/libcamera/pipeline/rpi/vc4/meson.build | 1 -\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 5 +-\n 7 files changed, 131 insertions(+), 98 deletions(-)\n rename {src/libcamera/pipeline/rpi/vc4 => include/libcamera/internal}/dma_heaps.h (92%)\n create mode 100644 src/libcamera/dma_heaps.cpp\n delete mode 100644 src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp", "diff": "diff --git a/src/libcamera/pipeline/rpi/vc4/dma_heaps.h b/include/libcamera/internal/dma_heaps.h\nsimilarity index 92%\nrename from src/libcamera/pipeline/rpi/vc4/dma_heaps.h\nrename to include/libcamera/internal/dma_heaps.h\nindex 0a4a8d86..cff8f140 100644\n--- a/src/libcamera/pipeline/rpi/vc4/dma_heaps.h\n+++ b/include/libcamera/internal/dma_heaps.h\n@@ -13,8 +13,6 @@\n \n namespace libcamera {\n \n-namespace RPi {\n-\n class DmaHeap\n {\n public:\n@@ -27,6 +25,4 @@ private:\n \tUniqueFD dmaHeapHandle_;\n };\n \n-} /* namespace RPi */\n-\n } /* namespace libcamera */\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 7f1f3440..33eb0fb3 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -25,6 +25,7 @@ libcamera_internal_headers = files([\n 'device_enumerator.h',\n 'device_enumerator_sysfs.h',\n 'device_enumerator_udev.h',\n+ 'dma_heaps.h',\n 'formats.h',\n 'framebuffer.h',\n 'ipa_manager.h',\ndiff --git a/src/libcamera/dma_heaps.cpp b/src/libcamera/dma_heaps.cpp\nnew file mode 100644\nindex 00000000..38ef175a\n--- /dev/null\n+++ b/src/libcamera/dma_heaps.cpp\n@@ -0,0 +1,127 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi Ltd\n+ *\n+ * dma_heaps.h - Helper class for dma-heap allocations.\n+ */\n+\n+#include \"libcamera/internal/dma_heaps.h\"\n+\n+#include <array>\n+#include <fcntl.h>\n+#include <sys/ioctl.h>\n+#include <unistd.h>\n+\n+#include <linux/dma-buf.h>\n+#include <linux/dma-heap.h>\n+\n+#include <libcamera/base/log.h>\n+\n+/**\n+ * \\file dma_heaps.cpp\n+ * \\brief CMA dma-heap allocator\n+ */\n+\n+/*\n+ * /dev/dma_heap/linux,cma is the dma-heap allocator, which allows dmaheap-cma\n+ * to only have to worry about importing.\n+ *\n+ * Annoyingly, should the cma heap size be specified on the kernel command line\n+ * instead of DT, the heap gets named \"reserved\" instead.\n+ */\n+static constexpr std::array<const char *, 2> heapNames = {\n+\t\"/dev/dma_heap/linux,cma\",\n+\t\"/dev/dma_heap/reserved\"\n+};\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(DmaHeap)\n+\n+/**\n+ * \\class DmaHeap\n+ * \\brief Helper class for CMA dma-heap allocations\n+ */\n+\n+/**\n+ * \\brief Construct a DmaHeap that owns a CMA dma-heap file descriptor\n+ *\n+ * Goes through the internal list of possible names of the CMA dma-heap devices\n+ * until a CMA dma-heap device is successfully opened. If it fails to open any\n+ * dma-heap device, an invalid DmaHeap object is constructed. A valid DmaHeap\n+ * object owns a wrapped dma-heap file descriptor.\n+ *\n+ * Please check the new DmaHeap object with \\ref DmaHeap::isValid before using it.\n+ */\n+DmaHeap::DmaHeap()\n+{\n+\tfor (const char *name : heapNames) {\n+\t\tint ret = ::open(name, O_RDWR | O_CLOEXEC, 0);\n+\t\tif (ret < 0) {\n+\t\t\tret = errno;\n+\t\t\tLOG(DmaHeap, Debug)\n+\t\t\t\t<< \"Failed to open \" << name << \": \"\n+\t\t\t\t<< strerror(ret);\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tdmaHeapHandle_ = UniqueFD(ret);\n+\t\tbreak;\n+\t}\n+\n+\tif (!dmaHeapHandle_.isValid())\n+\t\tLOG(DmaHeap, Error) << \"Could not open any dmaHeap device\";\n+}\n+\n+/**\n+ * \\brief Destroy the DmaHeap instance\n+ *\n+ * Destroying a DmaHeap instance which owns a wrapped dma-heap file descriptor\n+ * closes the descriptor automatically.\n+ */\n+DmaHeap::~DmaHeap() = default;\n+\n+/**\n+ * \\fn DmaHeap::isValid()\n+ * \\brief Check if the DmaHeap instance is valid\n+ * \\return True if the DmaHeap is valid, false otherwise\n+ */\n+\n+/**\n+ * \\brief Allocate a dma-buf from the DmaHeap\n+ * \\param [in] name The name to set for the allocated buffer\n+ * \\param [in] size The size of the buffer to allocate\n+ * \\return The \\ref UniqueFD of the allocated buffer\n+ *\n+ * Allocates a dma-buf with read/write access.\n+ * If the allocation fails returns invalid UniqueFD.\n+ */\n+UniqueFD DmaHeap::alloc(const char *name, std::size_t size)\n+{\n+\tint ret;\n+\n+\tif (!name)\n+\t\treturn {};\n+\n+\tstruct dma_heap_allocation_data alloc = {};\n+\n+\talloc.len = size;\n+\talloc.fd_flags = O_CLOEXEC | O_RDWR;\n+\n+\tret = ::ioctl(dmaHeapHandle_.get(), DMA_HEAP_IOCTL_ALLOC, &alloc);\n+\tif (ret < 0) {\n+\t\tLOG(DmaHeap, Error) << \"dmaHeap allocation failure for \" << name;\n+\t\treturn {};\n+\t}\n+\n+\tUniqueFD allocFd(alloc.fd);\n+\tret = ::ioctl(allocFd.get(), DMA_BUF_SET_NAME, name);\n+\tif (ret < 0) {\n+\t\tLOG(DmaHeap, Error) << \"dmaHeap naming failure for \" << name;\n+\t\treturn {};\n+\t}\n+\n+\treturn allocFd;\n+}\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 2e7b0c77..dd8107fa 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -15,6 +15,7 @@ libcamera_sources = files([\n 'delayed_controls.cpp',\n 'device_enumerator.cpp',\n 'device_enumerator_sysfs.cpp',\n+ 'dma_heaps.cpp',\n 'fence.cpp',\n 'formats.cpp',\n 'framebuffer.cpp',\ndiff --git a/src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp b/src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp\ndeleted file mode 100644\nindex 317b1fc1..00000000\n--- a/src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp\n+++ /dev/null\n@@ -1,90 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2020, Raspberry Pi Ltd\n- *\n- * dma_heaps.h - Helper class for dma-heap allocations.\n- */\n-\n-#include \"dma_heaps.h\"\n-\n-#include <array>\n-#include <fcntl.h>\n-#include <linux/dma-buf.h>\n-#include <linux/dma-heap.h>\n-#include <sys/ioctl.h>\n-#include <unistd.h>\n-\n-#include <libcamera/base/log.h>\n-\n-/*\n- * /dev/dma-heap/linux,cma is the dma-heap allocator, which allows dmaheap-cma\n- * to only have to worry about importing.\n- *\n- * Annoyingly, should the cma heap size be specified on the kernel command line\n- * instead of DT, the heap gets named \"reserved\" instead.\n- */\n-static constexpr std::array<const char *, 2> heapNames = {\n-\t\"/dev/dma_heap/linux,cma\",\n-\t\"/dev/dma_heap/reserved\"\n-};\n-\n-namespace libcamera {\n-\n-LOG_DECLARE_CATEGORY(RPI)\n-\n-namespace RPi {\n-\n-DmaHeap::DmaHeap()\n-{\n-\tfor (const char *name : heapNames) {\n-\t\tint ret = ::open(name, O_RDWR | O_CLOEXEC, 0);\n-\t\tif (ret < 0) {\n-\t\t\tret = errno;\n-\t\t\tLOG(RPI, Debug) << \"Failed to open \" << name << \": \"\n-\t\t\t\t\t<< strerror(ret);\n-\t\t\tcontinue;\n-\t\t}\n-\n-\t\tdmaHeapHandle_ = UniqueFD(ret);\n-\t\tbreak;\n-\t}\n-\n-\tif (!dmaHeapHandle_.isValid())\n-\t\tLOG(RPI, Error) << \"Could not open any dmaHeap device\";\n-}\n-\n-DmaHeap::~DmaHeap() = default;\n-\n-UniqueFD DmaHeap::alloc(const char *name, std::size_t size)\n-{\n-\tint ret;\n-\n-\tif (!name)\n-\t\treturn {};\n-\n-\tstruct dma_heap_allocation_data alloc = {};\n-\n-\talloc.len = size;\n-\talloc.fd_flags = O_CLOEXEC | O_RDWR;\n-\n-\tret = ::ioctl(dmaHeapHandle_.get(), DMA_HEAP_IOCTL_ALLOC, &alloc);\n-\tif (ret < 0) {\n-\t\tLOG(RPI, Error) << \"dmaHeap allocation failure for \"\n-\t\t\t\t<< name;\n-\t\treturn {};\n-\t}\n-\n-\tUniqueFD allocFd(alloc.fd);\n-\tret = ::ioctl(allocFd.get(), DMA_BUF_SET_NAME, name);\n-\tif (ret < 0) {\n-\t\tLOG(RPI, Error) << \"dmaHeap naming failure for \"\n-\t\t\t\t<< name;\n-\t\treturn {};\n-\t}\n-\n-\treturn allocFd;\n-}\n-\n-} /* namespace RPi */\n-\n-} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/rpi/vc4/meson.build b/src/libcamera/pipeline/rpi/vc4/meson.build\nindex cdb049c5..386e2296 100644\n--- a/src/libcamera/pipeline/rpi/vc4/meson.build\n+++ b/src/libcamera/pipeline/rpi/vc4/meson.build\n@@ -1,7 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libcamera_sources += files([\n- 'dma_heaps.cpp',\n 'vc4.cpp',\n ])\n \ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex ad7dddde..947b1e73 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -12,12 +12,11 @@\n #include <libcamera/formats.h>\n \n #include \"libcamera/internal/device_enumerator.h\"\n+#include \"libcamera/internal/dma_heaps.h\"\n \n #include \"../common/pipeline_base.h\"\n #include \"../common/rpi_stream.h\"\n \n-#include \"dma_heaps.h\"\n-\n using namespace std::chrono_literals;\n \n namespace libcamera {\n@@ -87,7 +86,7 @@ public:\n \tRPi::Device<Isp, 4> isp_;\n \n \t/* DMAHEAP allocation helper. */\n-\tRPi::DmaHeap dmaHeap_;\n+\tDmaHeap dmaHeap_;\n \tSharedFD lsTable_;\n \n \tstruct Config {\n", "prefixes": [ "v6", "02/18" ] }