Patch Detail
Show a patch.
GET /api/1.1/patches/21876/?format=api
{ "id": 21876, "url": "https://patchwork.libcamera.org/api/1.1/patches/21876/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21876/", "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": "<20241112100051.4071443-3-chenghaoyang@chromium.org>", "date": "2024-11-12T09:56:55", "name": "[2/2] debayer_cpu: Replace syncing DMABUFs with DmaSyncer", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "963cdfd18a9c60d16745516e6d503e41f2306482", "submitter": { "id": 117, "url": "https://patchwork.libcamera.org/api/1.1/people/117/?format=api", "name": "Cheng-Hao Yang", "email": "chenghaoyang@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21876/mbox/", "series": [ { "id": 4785, "url": "https://patchwork.libcamera.org/api/1.1/series/4785/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4785", "date": "2024-11-12T09:56:53", "name": "Add DmaSyncer", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4785/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21876/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21876/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 B0AE9C3259\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 12 Nov 2024 10:01:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6A6C1657E0;\n\tTue, 12 Nov 2024 11:01:02 +0100 (CET)", "from mail-il1-x12a.google.com (mail-il1-x12a.google.com\n\t[IPv6:2607:f8b0:4864:20::12a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 667E665474\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 12 Nov 2024 11:01:00 +0100 (CET)", "by mail-il1-x12a.google.com with SMTP id\n\te9e14a558f8ab-3a6c1cfcb91so22990425ab.0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 12 Nov 2024 02:01:00 -0800 (PST)", "from chenghaoyang-low.c.googlers.com.com\n\t(27.247.221.35.bc.googleusercontent.com. [35.221.247.27])\n\tby smtp.gmail.com with ESMTPSA id\n\t41be03b00d2f7-7f41f644214sm10157673a12.58.2024.11.12.02.00.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 12 Nov 2024 02:00:58 -0800 (PST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"Ge6qavCP\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1731405659; x=1732010459;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=ETSnPQEUGsC+Ye+ja0ckktThpUHtsZEYfIELXy3ebhU=;\n\tb=Ge6qavCPjyf/8LLFBcV0WQM0XZhaD1dEDGFHiQmviWkFtkLCs1oKUSpD4vH5BUpvJC\n\t7OwYBukjD37ALrea1xuCSfbOQNrlKrnuhWr/yvWkHpybCNylV+IVK7ABN24ZK17z//RU\n\tWFiKnzYyG/gMk05S1Hz82vwzKo9tShfZGth/I=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1731405659; x=1732010459;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=ETSnPQEUGsC+Ye+ja0ckktThpUHtsZEYfIELXy3ebhU=;\n\tb=g3BxPP51yjD6XyvL556XBPMrH+kJCvKFHUWmj1PyAhyOwVrj03JFkEXhxhcWwUvxDz\n\t7XLsA9LIp8rg55fhAvblLGUyDcOF7TLiWV0e7FQwPkEaZY6s1qT2PH1qo7xH3O3aE5kV\n\t8HbH9xELuk4No1qaySFC7FI+MOQuiBu+ZAvkscufmS2U0AhDVP/+EakwFSWXFqQa14NN\n\tHAijZglExPPHpbXxkVV52u16f3WbNqPcDqVvTlfQGvQNPJrovymOKX7oysC2qxKTQoX4\n\tdKpZTXr2OLPNC5bkEthHUE27ztzZyfyZJUzqoTWBBfqjvWead0Oka9e9kZfuOKhYQqIS\n\t1HrQ==", "X-Gm-Message-State": "AOJu0YzvJVZdrTnH5joicB3tL8GhknMY3XV+3ptyoI81Sq50n/cg3NYO\n\tfZNAJea6V9E87iZwp2Ft7T2SBOPmGb82CRquS2Xh7nHSbYBBSjULrLQATqbqAwFKXxgaNNMBMOE\n\t=", "X-Google-Smtp-Source": "AGHT+IHUMM/pkYrfVh69h2zB9MI1iJfRjfSNnvif7oDKQZzxqMNL51QFDbokSawwGxyCzXPcJsc/4A==", "X-Received": "by 2002:a05:6e02:1568:b0:3a3:4175:79da with SMTP id\n\te9e14a558f8ab-3a70c827cb2mr21152985ab.13.1731405658775; \n\tTue, 12 Nov 2024 02:00:58 -0800 (PST)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@chromium.org>", "Subject": "[PATCH 2/2] debayer_cpu: Replace syncing DMABUFs with DmaSyncer", "Date": "Tue, 12 Nov 2024 09:56:55 +0000", "Message-ID": "<20241112100051.4071443-3-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.47.0.277.g8800431eea-goog", "In-Reply-To": "<20241112100051.4071443-1-chenghaoyang@chromium.org>", "References": "<20241112100051.4071443-1-chenghaoyang@chromium.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "As there's an existing helper class DmaSyncer that makes synchronizing\nDMABUFs more easily, this patch removes the self-defined function and\nreuse DmaSyncer.\n\nSigned-off-by: Harvey Yang <chenghaoyang@chromium.org>\n---\n src/libcamera/software_isp/debayer_cpu.cpp | 29 ++++++----------------\n 1 file changed, 8 insertions(+), 21 deletions(-)", "diff": "diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex cf5ecdf7a..852e14f20 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -20,6 +20,7 @@\n #include <libcamera/formats.h>\n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/dma_buf_allocator.h\"\n #include \"libcamera/internal/framebuffer.h\"\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n@@ -722,23 +723,6 @@ void DebayerCpu::process4(const uint8_t *src, uint8_t *dst)\n \n namespace {\n \n-void syncBufferForCPU(FrameBuffer *buffer, uint64_t syncFlags)\n-{\n-\tfor (const FrameBuffer::Plane &plane : buffer->planes()) {\n-\t\tconst int fd = plane.fd.get();\n-\t\tstruct dma_buf_sync sync = { syncFlags };\n-\t\tint ret;\n-\n-\t\tret = ioctl(fd, DMA_BUF_IOCTL_SYNC, &sync);\n-\t\tif (ret < 0) {\n-\t\t\tret = errno;\n-\t\t\tLOG(Debayer, Error)\n-\t\t\t\t<< \"Syncing buffer FD \" << fd << \" with flags \"\n-\t\t\t\t<< syncFlags << \" failed: \" << strerror(ret);\n-\t\t}\n-\t}\n-}\n-\n inline int64_t timeDiff(timespec &after, timespec &before)\n {\n \treturn (after.tv_sec - before.tv_sec) * 1000000000LL +\n@@ -756,8 +740,12 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n \t\tclock_gettime(CLOCK_MONOTONIC_RAW, &frameStartTime);\n \t}\n \n-\tsyncBufferForCPU(input, DMA_BUF_SYNC_START | DMA_BUF_SYNC_READ);\n-\tsyncBufferForCPU(output, DMA_BUF_SYNC_START | DMA_BUF_SYNC_WRITE);\n+\tstd::vector<DmaSyncer> dmaSyncers;\n+\tfor (const FrameBuffer::Plane &plane : input->planes())\n+\t\tdmaSyncers.emplace_back(plane.fd.get(), DmaBufAllocator::SyncType::Read);\n+\n+\tfor (const FrameBuffer::Plane &plane : output->planes())\n+\t\tdmaSyncers.emplace_back(plane.fd.get(), DmaBufAllocator::SyncType::Write);\n \n \tgreen_ = params.green;\n \tred_ = swapRedBlueGains_ ? params.blue : params.red;\n@@ -786,8 +774,7 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n \n \tmetadata.planes()[0].bytesused = out.planes()[0].size();\n \n-\tsyncBufferForCPU(output, DMA_BUF_SYNC_END | DMA_BUF_SYNC_WRITE);\n-\tsyncBufferForCPU(input, DMA_BUF_SYNC_END | DMA_BUF_SYNC_READ);\n+\tdmaSyncers.clear();\n \n \t/* Measure before emitting signals */\n \tif (measuredFrames_ < DebayerCpu::kLastFrameToMeasure &&\n", "prefixes": [ "2/2" ] }