{"id":19392,"url":"https://patchwork.libcamera.org/api/1.1/patches/19392/?format=json","web_url":"https://patchwork.libcamera.org/patch/19392/","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":"<20240113142218.28063-3-hdegoede@redhat.com>","date":"2024-01-13T14:22:02","name":"[libcamera-devel,v2,02/18] libcamera: internal: Move dma_heaps.[h, cpp] to common directories","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"1e0682494c5c4531822afc7f49c0bd0afe682da4","submitter":{"id":102,"url":"https://patchwork.libcamera.org/api/1.1/people/102/?format=json","name":"Hans de Goede","email":"hdegoede@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19392/mbox/","series":[{"id":4142,"url":"https://patchwork.libcamera.org/api/1.1/series/4142/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4142","date":"2024-01-13T14:22:00","name":"[libcamera-devel,v2,01/18] libcamera: pipeline: simple: fix size adjustment in validate()","version":2,"mbox":"https://patchwork.libcamera.org/series/4142/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19392/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19392/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 0A8BDC328C\n\tfor ;\n\tSat, 13 Jan 2024 14:22:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F654628D7;\n\tSat, 13 Jan 2024 15:22:38 +0100 (CET)","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 2796A628D7\n\tfor ;\n\tSat, 13 Jan 2024 15:22:36 +0100 (CET)","from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n\t[66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n\t(version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n\tus-mta-460-WFeYtAlVNRGHzGX6uekerA-1; Sat, 13 Jan 2024 09:22:31 -0500","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1])\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 094B5811E86;\n\tSat, 13 Jan 2024 14:22:31 +0000 (UTC)","from localhost.localdomain (unknown [10.39.192.58])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id EA0FB3C25;\n\tSat, 13 Jan 2024 14:22:28 +0000 (UTC)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1705155758;\n\tbh=MVH5Mb9n40cAdYJ18kqmacYPT+Is2fHh40jlXj3asio=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=Ie15+HBzdooUvIuu+/IOndAqoU5o1LKqhvuUY+yBAR1a4hc6JnZwtW5TSyCvzGZRa\n\tnu8/Biiv1MlsGrHM95MY62m+f7x1ZqJrMOHAFSVrgCKt+WByAPFZ0kCXgBauBTaxex\n\tkiloMNCF2bPT8JdKnBAaW3xkodCVV1UpjstjqGbtt7Bq+L5bYjKU2bxsKfyHYMlZic\n\tNDk/SKIOaMDE5iUXVehC+3Tg0FCzYQb+zRkGDqrJgA6VZSG6qbfIXYsV40IgaTHuH7\n\tr5H+tZzXBMsMlG6xr9yCzKg0c/fCCRfHbDZ4p20PrW2M5dn0rQZgAKrsQRQ4VJsbsN\n\tIFtP4p6XgXUuQ==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1705155755;\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=3Dph6tgUwIMymKaR6vzKDJ5GrjN1cKT7d9ocTwK0xS0=;\n\tb=bAQImjdIBhUqQeTh85FbuFCt2P9kUJL2bYBs8qKMsp2fxRnOE1AtjxU7L8FqUc3zjdjEXc\n\t7Aofn+egu5KTd/JC87Io2JgvUjUjfpnH5J16pzHHyOdplrHUbjwCG7uUMC5xoHkCkyUHuW\n\tH5vttJkw81cGcg6RKAQhMFE3QSINjCA="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=redhat.com\n\theader.i=@redhat.com header.b=\"bAQImjdI\"; \n\tdkim-atps=neutral","X-MC-Unique":"WFeYtAlVNRGHzGX6uekerA-1","To":"libcamera-devel@lists.libcamera.org,\n\tAndrey Konovalov ","Date":"Sat, 13 Jan 2024 15:22:02 +0100","Message-ID":"<20240113142218.28063-3-hdegoede@redhat.com>","In-Reply-To":"<20240113142218.28063-1-hdegoede@redhat.com>","References":"<20240113142218.28063-1-hdegoede@redhat.com>","MIME-Version":"1.0","X-Scanned-By":"MIMEDefang 3.4.1 on 10.11.54.1","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Transfer-Encoding":"8bit","Content-Type":"text/plain; charset=\"US-ASCII\"; x-default=true","Subject":"[libcamera-devel] [PATCH v2 02/18] libcamera: internal: Move\n\tdma_heaps.[h, cpp] to common directories","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","From":"Hans de Goede via libcamera-devel ","Reply-To":"Hans de Goede ","Cc":"Maxime Ripard , g.martti@gmail.com,\n\tt.langendam@gmail.com, srinivas.kandagatla@linaro.org,\n\tPavel Machek ,\n\tBryan O'Donoghue , admin@dennisbonke.com","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\nSigned-off-by: Andrey Konovalov \nSigned-off-by: Hans de Goede \nTested-by: Bryan O'Donoghue # sc8280xp Lenovo x13s\nTested-by: Pavel Machek \n---\n .../libcamera/internal}/dma_heaps.h | 4 ----\n include/libcamera/internal/meson.build | 1 +\n .../{pipeline/rpi/vc4 => }/dma_heaps.cpp | 18 +++++++-----------\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, 11 insertions(+), 19 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 (83%)","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 83%\nrename from src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp\nrename to src/libcamera/dma_heaps.cpp\nindex 317b1fc1..7444d9c2 100644\n--- a/src/libcamera/pipeline/rpi/vc4/dma_heaps.cpp\n+++ b/src/libcamera/dma_heaps.cpp\n@@ -5,8 +5,6 @@\n * dma_heaps.h - Helper class for dma-heap allocations.\n */\n \n-#include \"dma_heaps.h\"\n-\n #include \n #include \n #include \n@@ -16,6 +14,8 @@\n \n #include \n \n+#include \"libcamera/internal/dma_heaps.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@@ -30,9 +30,7 @@ static constexpr std::array heapNames = {\n \n namespace libcamera {\n \n-LOG_DECLARE_CATEGORY(RPI)\n-\n-namespace RPi {\n+LOG_DEFINE_CATEGORY(DmaHeap)\n \n DmaHeap::DmaHeap()\n {\n@@ -40,7 +38,7 @@ DmaHeap::DmaHeap()\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\tLOG(DmaHeap, Debug) << \"Failed to open \" << name << \": \"\n \t\t\t\t\t<< strerror(ret);\n \t\t\tcontinue;\n \t\t}\n@@ -50,7 +48,7 @@ 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 DmaHeap::~DmaHeap() = default;\n@@ -69,7 +67,7 @@ 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\tLOG(DmaHeap, Error) << \"dmaHeap allocation failure for \"\n \t\t\t\t<< name;\n \t\treturn {};\n \t}\n@@ -77,7 +75,7 @@ UniqueFD DmaHeap::alloc(const char *name, std::size_t size)\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\tLOG(DmaHeap, Error) << \"dmaHeap naming failure for \"\n \t\t\t\t<< name;\n \t\treturn {};\n \t}\n@@ -85,6 +83,4 @@ UniqueFD DmaHeap::alloc(const char *name, std::size_t size)\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 45f63e93..3c5e43df 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -17,6 +17,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 26102ea7..3a42e75e 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":["libcamera-devel","v2","02/18"]}