Patch Detail
Show a patch.
GET /api/patches/19872/?format=api
{ "id": 19872, "url": "https://patchwork.libcamera.org/api/patches/19872/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19872/", "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": "<20240416091357.211951-4-mzamazal@redhat.com>", "date": "2024-04-16T09:13:39", "name": "[v8,03/18] libcamera: dma_heaps: extend DmaHeap class to support system heap", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1d5462081b963536ce533836f4a44783f382876a", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19872/mbox/", "series": [ { "id": 4257, "url": "https://patchwork.libcamera.org/api/series/4257/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4257", "date": "2024-04-16T09:13:36", "name": "libcamera: introduce Software ISP and Software IPA", "version": 8, "mbox": "https://patchwork.libcamera.org/series/4257/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19872/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19872/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 A0746BE08B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 16 Apr 2024 09:14:35 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4437A63367;\n\tTue, 16 Apr 2024 11:14:35 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CF25D6334D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 16 Apr 2024 11:14:33 +0200 (CEST)", "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-160-yegjcgXDNUK5EA1WclCmlw-1;\n\tTue, 16 Apr 2024 05:14:28 -0400", "from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4])\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 94F933C000A8;\n\tTue, 16 Apr 2024 09:14:27 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.245])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 06DE92026962;\n\tTue, 16 Apr 2024 09:14:24 +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=\"eRIGdy3n\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1713258872;\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=R8/byd6dUigZ64mmZ9kebhGymAbTZo/+bGtNEq5e51U=;\n\tb=eRIGdy3nrjvbfVK9ZgkfJVk10NdP2M5bO8wfHct9m2FhHEaX7KqOZvaCy8YE1IumHKeVXh\n\tDttPSzGrKRoZ9Vbl4B02VtfHUm/1JU4+AuGrHatfep1eoN6hGu5NlNq2COYwSRP/6QD46f\n\tmJw7vkR5YQByohoJBTy2LH/xfM+Y8PI=", "X-MC-Unique": "yegjcgXDNUK5EA1WclCmlw-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Andrey Konovalov <andrey.konovalov@linaro.org>,\n\tMilan Zamazal <mzamazal@redhat.com>,\n\tAndrei Konovalov <andrey.konovalov.ynk@gmail.com>,\n\tBryan O'Donoghue <bryan.odonoghue@linaro.org>,\n\tMaxime Ripard <mripard@redhat.com>, Pavel Machek <pavel@ucw.cz>,\n\tHans de Goede <hdegoede@redhat.com>,\n\tKieran Bingham <kieran.bingham@ideasonboard.com>,\n\tLaurent Pinchart <laurent.pinchart@ideasonboard.com>", "Subject": "[PATCH v8 03/18] libcamera: dma_heaps: extend DmaHeap class to\n\tsupport system heap", "Date": "Tue, 16 Apr 2024 11:13:39 +0200", "Message-ID": "<20240416091357.211951-4-mzamazal@redhat.com>", "In-Reply-To": "<20240416091357.211951-1-mzamazal@redhat.com>", "References": "<20240416091357.211951-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.11.54.4", "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\nAdd an argument to the constructor to specify dma heaps type(s)\nto use. Can be DmaHeapFlag::Cma and/or DmaHeapFlag::System.\nBy default DmaHeapFlag::Cma is used. If both DmaHeapFlag::Cma and\nDmaHeapFlag::System are set, CMA heap is tried first.\n\nTested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s\nTested-by: Pavel Machek <pavel@ucw.cz>\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\nReviewed-by: Pavel Machek <pavel@ucw.cz>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>\nSigned-off-by: Hans de Goede <hdegoede@redhat.com>\n---\n include/libcamera/internal/dma_heaps.h | 12 ++++-\n src/libcamera/dma_heaps.cpp | 69 ++++++++++++++++++++------\n 2 files changed, 66 insertions(+), 15 deletions(-)", "diff": "diff --git a/include/libcamera/internal/dma_heaps.h b/include/libcamera/internal/dma_heaps.h\nindex cff8f140..80bf29e7 100644\n--- a/include/libcamera/internal/dma_heaps.h\n+++ b/include/libcamera/internal/dma_heaps.h\n@@ -9,6 +9,7 @@\n \n #include <stddef.h>\n \n+#include <libcamera/base/flags.h>\n #include <libcamera/base/unique_fd.h>\n \n namespace libcamera {\n@@ -16,7 +17,14 @@ namespace libcamera {\n class DmaHeap\n {\n public:\n-\tDmaHeap();\n+\tenum class DmaHeapFlag {\n+\t\tCma = 1 << 0,\n+\t\tSystem = 1 << 1,\n+\t};\n+\n+\tusing DmaHeapFlags = Flags<DmaHeapFlag>;\n+\n+\tDmaHeap(DmaHeapFlags flags = DmaHeapFlag::Cma);\n \t~DmaHeap();\n \tbool isValid() const { return dmaHeapHandle_.isValid(); }\n \tUniqueFD alloc(const char *name, std::size_t size);\n@@ -25,4 +33,6 @@ private:\n \tUniqueFD dmaHeapHandle_;\n };\n \n+LIBCAMERA_FLAGS_ENABLE_OPERATORS(DmaHeap::DmaHeapFlag)\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/dma_heaps.cpp b/src/libcamera/dma_heaps.cpp\nindex e543045d..b4509e72 100644\n--- a/src/libcamera/dma_heaps.cpp\n+++ b/src/libcamera/dma_heaps.cpp\n@@ -19,9 +19,11 @@\n \n /**\n * \\file dma_heaps.cpp\n- * \\brief CMA dma-heap allocator\n+ * \\brief dma-heap allocator\n */\n \n+namespace libcamera {\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@@ -29,40 +31,79 @@\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+#ifndef __DOXYGEN__\n+struct DmaHeapInfo {\n+\tDmaHeap::DmaHeapFlag type;\n+\tconst char *deviceNodeName;\n };\n+#endif\n \n-namespace libcamera {\n+static constexpr std::array<DmaHeapInfo, 3> heapInfos = { {\n+\t{ DmaHeap::DmaHeapFlag::Cma, \"/dev/dma_heap/linux,cma\" },\n+\t{ DmaHeap::DmaHeapFlag::Cma, \"/dev/dma_heap/reserved\" },\n+\t{ DmaHeap::DmaHeapFlag::System, \"/dev/dma_heap/system\" },\n+} };\n \n LOG_DEFINE_CATEGORY(DmaHeap)\n \n /**\n * \\class DmaHeap\n- * \\brief Helper class for CMA dma-heap allocations\n+ * \\brief Helper class for dma-heap allocations\n+ *\n+ * DMA heaps are kernel devices that provide an API to allocate memory from\n+ * different pools called \"heaps\", wrap each allocated piece of memory in a\n+ * dmabuf object, and return the dmabuf file descriptor to userspace. Multiple\n+ * heaps can be provided by the system, with different properties for the\n+ * underlying memory.\n+ *\n+ * This class wraps a DMA heap selected at construction time, and exposes\n+ * functions to manage memory allocation.\n+ */\n+\n+/**\n+ * \\enum DmaHeap::DmaHeapFlag\n+ * \\brief Type of the dma-heap\n+ * \\var DmaHeap::Cma\n+ * \\brief Allocate from a CMA dma-heap, providing physically-contiguous memory\n+ * \\var DmaHeap::System\n+ * \\brief Allocate from the system dma-heap, using the page allocator\n */\n \n /**\n- * \\brief Construct a DmaHeap that owns a CMA dma-heap file descriptor\n+ * \\typedef DmaHeap::DmaHeapFlags\n+ * \\brief A bitwise combination of DmaHeap::DmaHeapFlag values\n+ */\n+\n+/**\n+ * \\brief Construct a DmaHeap of a given type\n+ * \\param[in] type The type(s) of the dma-heap(s) to allocate from\n *\n- * Looks for a CMA dma-heap device to use. If it fails to open any dma-heap\n- * device, an invalid DmaHeap object is constructed.\n+ * The DMA heap type is selected with the \\a type parameter, which defaults to\n+ * the CMA heap. If no heap of the given type can be accessed, the constructed\n+ * DmaHeap instance is invalid as indicated by the isValid() function.\n *\n- * Check the new DmaHeap object with isValid before using it.\n+ * Multiple types can be selected by combining type flags, in which case the\n+ * constructed DmaHeap will match one of the types. If the system provides\n+ * multiple heaps that match the requested types, which heap is used is\n+ * undefined.\n */\n-DmaHeap::DmaHeap()\n+DmaHeap::DmaHeap(DmaHeapFlags type)\n {\n-\tfor (const char *name : heapNames) {\n-\t\tint ret = ::open(name, O_RDWR | O_CLOEXEC, 0);\n+\tfor (const auto &info : heapInfos) {\n+\t\tif (!(type & info.type))\n+\t\t\tcontinue;\n+\n+\t\tint ret = ::open(info.deviceNodeName, 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<< \"Failed to open \" << info.deviceNodeName << \": \"\n \t\t\t\t<< strerror(ret);\n \t\t\tcontinue;\n \t\t}\n \n+\t\tLOG(DmaHeap, Debug) << \"Using \" << info.deviceNodeName;\n \t\tdmaHeapHandle_ = UniqueFD(ret);\n \t\tbreak;\n \t}\n", "prefixes": [ "v8", "03/18" ] }