Patch Detail
Show a patch.
GET /api/1.1/patches/22053/?format=api
{ "id": 22053, "url": "https://patchwork.libcamera.org/api/1.1/patches/22053/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22053/", "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": "<20241121055436.2502314-3-chenghaoyang@chromium.org>", "date": "2024-11-21T05:51:32", "name": "[v3,2/2] debayer_cpu: Replace syncing DMABUFs with DmaSyncer", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f490eaac9bb3062e22b9c3c578f77f3f93c7179b", "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/22053/mbox/", "series": [ { "id": 4811, "url": "https://patchwork.libcamera.org/api/1.1/series/4811/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4811", "date": "2024-11-21T05:51:30", "name": "Add DmaSyncer", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4811/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22053/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22053/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 B0051C32FB\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 21 Nov 2024 05:54:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EA46A65FAA;\n\tThu, 21 Nov 2024 06:54:54 +0100 (CET)", "from mail-pg1-x529.google.com (mail-pg1-x529.google.com\n\t[IPv6:2607:f8b0:4864:20::529])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B35D565FA1\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 21 Nov 2024 06:54:46 +0100 (CET)", "by mail-pg1-x529.google.com with SMTP id\n\t41be03b00d2f7-7f12ba78072so463545a12.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 20 Nov 2024 21:54:46 -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\td2e1a72fcca58-724bef8da82sm2815815b3a.124.2024.11.20.21.54.42\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 20 Nov 2024 21:54:43 -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=\"bZQNtpja\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=chromium.org; s=google; t=1732168485; x=1732773285;\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=36dmZHlgBtkx0ifRAWdxsru0TSO9A+QrGioh6Y9/Qzg=;\n\tb=bZQNtpjaORtCxZnMqAa/Z5KYRI28MuQtGNJo4wwPTpizX79PO8O5ALAu2kdaMmrsV0\n\tVQfqcYH+ivRx3HgJEKHd4dFVfkFqqJ/BNnv6YGMr1YIJngJMH+Q/0zzHMcLgmEoz2Mqt\n\tKeQ7xDm3wBBi2KCEqLcqs85oNtj5Sj0QR7Zts=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1732168485; x=1732773285;\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=36dmZHlgBtkx0ifRAWdxsru0TSO9A+QrGioh6Y9/Qzg=;\n\tb=MRlp7u4S8YM6xk1bKdBpczXegBqBleYmAhslHoARaS1BWZgXVAFjK6JoHNbDXoDLcL\n\taSaCLiHxa8NW7NtdGZqBCQHID1j822VEr5pDRYYVpGvjvDakRyaZ0KEFmkOxWJIs57Da\n\thM1bUwjY/9Bq+TL96ANoBKj6RifdnKuB6u1sqSoGlGUHUFFpl3ALbe4q3qcHjT4vz5b3\n\t35Pj7a/SGkwnpaYShr2KG2qZI5rt7a18+8fitSb+iuk2lVTZ3BiL6smW5RBUkrKbK2RX\n\tBlnc3Rx+4MS/UVTb6TqvwWxQFuPRQg0XiHBswWdM/YHNufLeX6gsOSfDUGR/ReBSsLXF\n\tMYHQ==", "X-Gm-Message-State": "AOJu0YzuQayzfcLOcd50+KpfxycdrrR5NtQwfjEzXRSJbXAyaY1m0+3r\n\tUsoT97iCxpq8n7rPgfPX9XG9fpAxjLLaX9EEyrz4pMWmHkMWlMUcuAc3t2l45dq4V1Sd5yUxKew\n\t=", "X-Gm-Gg": "ASbGncslVxfeSs6zj2ZFEATEvA6TQpppjPqX9FW1O6oWVfLrWxKPOZ3MFGwQZknFtvB\n\tMqJqD2YE/PY22HiAPNq0XBYy7RP33HtPzhoI8WRQsKzW2wfCIqgncpGj2P8ZA+HDybdAxid2vyZ\n\tjRF+PL8BMPbDzyFCL0zzeG8DLPvD+Y+wX363J5ctWxlcJTxUcz/lIhfi/f9eX2twKj3tPK3Hz1e\n\thcV5efNm3SzquqUVQO4NjRaFbuOsUIZyfCOBlYaCpkCmXDHEhs+zlxqJK0nQ5A2+HWTGAO1ZobH\n\tQftc2nkDLmiQQDQv8pa+DOde5Lo4Gu6NCalnCVPIHA20iav2IX3mRw==", "X-Google-Smtp-Source": "AGHT+IEck272V8QSYgGaT0IP53mYOxFHxodGWIyvnrurE6XAZ5SQsV2iksO5jDDTV3DrMyBfUPs5wQ==", "X-Received": "by 2002:a05:6a20:7347:b0:1dc:77fc:1cdb with SMTP id\n\tadf61e73a8af0-1ddae4e291dmr6824895637.13.1732168484752; \n\tWed, 20 Nov 2024 21:54:44 -0800 (PST)", "From": "Harvey Yang <chenghaoyang@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Harvey Yang <chenghaoyang@chromium.org>,\n\tMilan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH v3 2/2] debayer_cpu: Replace syncing DMABUFs with DmaSyncer", "Date": "Thu, 21 Nov 2024 05:51:32 +0000", "Message-ID": "<20241121055436.2502314-3-chenghaoyang@chromium.org>", "X-Mailer": "git-send-email 2.47.0.338.g60cca15819-goog", "In-Reply-To": "<20241121055436.2502314-1-chenghaoyang@chromium.org>", "References": "<20241121055436.2502314-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>\nReviewed-by: Milan Zamazal <mzamazal@redhat.com>\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..31ab96ab3 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, DmaSyncer::SyncType::Read);\n+\n+\tfor (const FrameBuffer::Plane &plane : output->planes())\n+\t\tdmaSyncers.emplace_back(plane.fd, DmaSyncer::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": [ "v3", "2/2" ] }