{"id":19822,"url":"https://patchwork.libcamera.org/api/1.1/patches/19822/?format=json","web_url":"https://patchwork.libcamera.org/patch/19822/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20240404084657.353464-3-mzamazal@redhat.com>","date":"2024-04-04T08:46:39","name":"[v7,02/18] libcamera: internal: Move dma_heaps.[h, cpp] to common directories","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"0fce533e15c72bb3706807ea935e2f6a385e0c6c","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/1.1/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19822/mbox/","series":[{"id":4246,"url":"https://patchwork.libcamera.org/api/1.1/series/4246/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4246","date":"2024-04-04T08:46:37","name":"libcamera: introduce Software ISP and Software IPA","version":7,"mbox":"https://patchwork.libcamera.org/series/4246/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19822/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19822/checks/","tags":{},"headers":{"Return-Path":"","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 66A74C327C\n\tfor ;\n\tThu, 4 Apr 2024 08:47:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7FBD96337E;\n\tThu, 4 Apr 2024 10:47:37 +0200 (CEST)","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 7AB9463373\n\tfor ;\n\tThu, 4 Apr 2024 10:47:34 +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-375-zblL_6FxNQKWWCf17ekWsA-1;\n\tThu, 04 Apr 2024 04:47:29 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5])\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 11C161C07825;\n\tThu, 4 Apr 2024 08:47:29 +0000 (UTC)","from nuthatch.brq.redhat.com (unknown [10.43.17.39])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 802118173;\n\tThu, 4 Apr 2024 08:47:27 +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=\"FZrkD/52\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1712220453;\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=zHWYHQ7jsPzl6n/6LYUiH/DkKCivo5ni/Q8HyVC7sVY=;\n\tb=FZrkD/52zUoB/9KNvaQOP5hz3t+Z81bNHAVGCMwDPx0g0F8JyQBdbewM5WrIqKPenO/erK\n\tjb9eHlptyVjZNFQe4ZMtJ5Mnwm/a16bQdhDiO0XMYRTR1SPH9bF3MI2IvkrnJc+S+065AG\n\tTKqS0rpjsQa1iD9qLMjIOztTmnYDpy0=","X-MC-Unique":"zblL_6FxNQKWWCf17ekWsA-1","From":"Milan Zamazal ","To":"libcamera-devel@lists.libcamera.org","Cc":"Andrey Konovalov ,\n\tAndrei Konovalov ,\n\tBryan O'Donoghue ,\n\tMaxime Ripard , Milan Zamazal , \n\tPavel Machek , Hans de Goede ,\n\tKieran Bingham ,\n\tLaurent Pinchart ,\n\tNaushir Patuck ","Subject":"[PATCH v7 02/18] libcamera: internal: Move dma_heaps.[h,\n\tcpp] to common directories","Date":"Thu, 4 Apr 2024 10:46:39 +0200","Message-ID":"<20240404084657.353464-3-mzamazal@redhat.com>","In-Reply-To":"<20240404084657.353464-1-mzamazal@redhat.com>","References":"<20240404084657.353464-1-mzamazal@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.5","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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Andrey Konovalov \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 # sc8280xp Lenovo x13s\nTested-by: Pavel Machek \nReviewed-by: Kieran Bingham \nReviewed-by: Naushir Patuck \nReviewed-by: Pavel Machek \nSigned-off-by: Andrey Konovalov \nSigned-off-by: Hans de Goede \nReviewed-by: Milan Zamazal \n---\n .../libcamera/internal}/dma_heaps.h | 4 --\n include/libcamera/internal/meson.build | 1 +\n .../{pipeline/rpi/vc4 => }/dma_heaps.cpp | 63 ++++++++++++++-----\n src/libcamera/meson.build | 1 +\n src/libcamera/pipeline/rpi/vc4/meson.build | 1 -\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 5 +-\n 6 files changed, 52 insertions(+), 23 deletions(-)\n rename {src/libcamera/pipeline/rpi/vc4 => include/libcamera/internal}/dma_heaps.h (92%)\n rename src/libcamera/{pipeline/rpi/vc4 => }/dma_heaps.cpp (51%)","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/pipeline/rpi/vc4/dma_heaps.cpp b/src/libcamera/dma_heaps.cpp\nsimilarity index 51%\nrename from src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp\nrename to src/libcamera/dma_heaps.cpp\nindex 317b1fc1..70da6f3a 100644\n--- a/src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp\n+++ b/src/libcamera/dma_heaps.cpp\n@@ -5,19 +5,25 @@\n * dma_heaps.h - Helper class for dma-heap allocations.\n */\n \n-#include \"dma_heaps.h\"\n+#include \"libcamera/internal/dma_heaps.h\"\n \n #include \n #include \n-#include \n-#include \n #include \n #include \n \n+#include \n+#include \n+\n #include \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+ * /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@@ -30,18 +36,30 @@ static constexpr std::array heapNames = {\n \n namespace libcamera {\n \n-LOG_DECLARE_CATEGORY(RPI)\n+LOG_DEFINE_CATEGORY(DmaHeap)\n \n-namespace RPi {\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+ * 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+ *\n+ * Check the new DmaHeap object with 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(RPI, Debug) << \"Failed to open \" << name << \": \"\n-\t\t\t\t\t<< strerror(ret);\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@@ -50,11 +68,30 @@ DmaHeap::DmaHeap()\n \t}\n \n \tif (!dmaHeapHandle_.isValid())\n-\t\tLOG(RPI, Error) << \"Could not open any dmaHeap device\";\n+\t\tLOG(DmaHeap, Error) << \"Could not open any dmaHeap device\";\n }\n \n+/**\n+ * \\brief Destroy the DmaHeap instance\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+ *\n+ * Allocates a dma-buf with read/write access.\n+ * If the allocation fails returns invalid UniqueFD.\n+ *\n+ * \\return The UniqueFD of the allocated buffer\n+ */\n UniqueFD DmaHeap::alloc(const char *name, std::size_t size)\n {\n \tint ret;\n@@ -69,22 +106,18 @@ UniqueFD DmaHeap::alloc(const char *name, std::size_t size)\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\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(RPI, Error) << \"dmaHeap naming failure for \"\n-\t\t\t\t<< name;\n+\t\tLOG(DmaHeap, Error) << \"dmaHeap naming failure for \" << name;\n \t\treturn {};\n \t}\n \n \treturn allocFd;\n }\n \n-} /* namespace RPi */\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/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 \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_;\n \n \t/* DMAHEAP allocation helper. */\n-\tRPi::DmaHeap dmaHeap_;\n+\tDmaHeap dmaHeap_;\n \tSharedFD lsTable_;\n \n \tstruct Config {\n","prefixes":["v7","02/18"]}