Patch Detail
Show a patch.
GET /api/patches/21285/?format=api
{ "id": 21285, "url": "https://patchwork.libcamera.org/api/patches/21285/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21285/", "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": "<20240916141125.212973-1-robert.mader@collabora.com>", "date": "2024-09-16T14:11:25", "name": "[v3] libcamera: debayer_cpu: Sync DMABUFs", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3041586c05df605c103e330f488f9e88f4681d35", "submitter": { "id": 140, "url": "https://patchwork.libcamera.org/api/people/140/?format=api", "name": "Robert Mader", "email": "robert.mader@collabora.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21285/mbox/", "series": [ { "id": 4602, "url": "https://patchwork.libcamera.org/api/series/4602/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4602", "date": "2024-09-16T14:11:25", "name": "[v3] libcamera: debayer_cpu: Sync DMABUFs", "version": 3, "mbox": "https://patchwork.libcamera.org/series/4602/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21285/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21285/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 1F047C3257\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 16 Sep 2024 14:11:45 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DECC2634FD;\n\tMon, 16 Sep 2024 16:11:43 +0200 (CEST)", "from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com\n\t[136.143.188.112])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7CC3A634F5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 16 Sep 2024 16:11:41 +0200 (CEST)", "by mx.zohomail.com with SMTPS id 1726495896890779.0329775157529;\n\tMon, 16 Sep 2024 07:11:36 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=collabora.com\n\theader.i=robert.mader@collabora.com header.b=\"JtUl3a71\"; \n\tdkim-atps=neutral", "ARC-Seal": "i=1; a=rsa-sha256; t=1726495898; cv=none; \n\td=zohomail.com; s=zohoarc; \n\tb=FsyhHX5a+yMY5OzWQ9lE0qetYjGZozScppRQVjWhz4fG2da1dSGSg71P6F6j74gqpYi8m2JrKUQ/5oB6IkLMYHOnu7x3BEobo5m3cnza4HViwQug2jmdFccK1cgpwWWbyP7ajJtKuYfLOBACgt7eqPUYXTgG33Gtt97F+AvgcHQ=", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; \n\ts=zohoarc; t=1726495898;\n\th=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To;\n\tbh=W4afRv48D4WfuLtGhUZ4DV33/lOaRTHjogzUeVJa7qU=; \n\tb=EktK8390J2O+KfwCwwUxQTJhWZBT7bDVxFU79RKO9Fc8PRMiE1kVVut+oP1VqwVxmZKqTKu6fDZtX0i5nrkyzXdCnnqlLYJDLa1M8IIx6p0P6DqeCJ7kKbZ+N3zMPoPs5yd8eOJyMuVceonHJ4MCIvDmlW7y9MG2218K6Wf+S6s=", "ARC-Authentication-Results": "i=1; mx.zohomail.com;\n\tdkim=pass header.i=collabora.com;\n\tspf=pass smtp.mailfrom=robert.mader@collabora.com;\n\tdmarc=pass header.from=<robert.mader@collabora.com>", "DKIM-Signature": "v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1726495898;\n\ts=zohomail; d=collabora.com; i=robert.mader@collabora.com;\n\th=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To;\n\tbh=W4afRv48D4WfuLtGhUZ4DV33/lOaRTHjogzUeVJa7qU=;\n\tb=JtUl3a71+ZZpuY+uBRDUr5RgSiJtSP8vVDCFsRFXCU68gHOQT+SEbsc3Ub8oXy3P\n\tMDm66KQK7S6Dd57zh2ROy9iBLGuMffIbRLeDnBG5wCXG7hhibHxv+sJ/QqdLsGPICa5\n\tCqixHbO62bGLBLUz2ZYHrV3eON4n9AaYXkQgW7KE=", "From": "Robert Mader <robert.mader@collabora.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Robert Mader <robert.mader@collabora.com>", "Subject": "[PATCH v3] libcamera: debayer_cpu: Sync DMABUFs", "Date": "Mon, 16 Sep 2024 16:11:25 +0200", "Message-ID": "<20240916141125.212973-1-robert.mader@collabora.com>", "X-Mailer": "git-send-email 2.46.0", "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": "Using `DMA_BUF_IOCTL_SYNC` is required for DMABUFs in order to ensure\ncorrect output. Not doing so currently results in occasional tearing\nand/or backlashes in GL/VK clients that use the buffers directly for\nrendering.\n\nAn alternative approach to have the sync code in `MappedFrameBuffer` was\nconsidered but rejected for now, in order to allow clients more\nflexibility.\n\nSigned-off-by: Robert Mader <robert.mader@collabora.com>\n\n---\n\nChanges in v3:\n - add syncBufferForCPU() helper function\n\nChanges in v2:\n - sync input buffer as well\n - update commit title accordingly\n - small changes to the commit message\n - linting fixes, should pass now\n---\n src/libcamera/software_isp/debayer_cpu.cpp | 20 ++++++++++++++++++++\n 1 file changed, 20 insertions(+)", "diff": "diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 077f7f4b..3748bd7c 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -12,8 +12,11 @@\n #include \"debayer_cpu.h\"\n \n #include <stdlib.h>\n+#include <sys/ioctl.h>\n #include <time.h>\n \n+#include <linux/dma-buf.h>\n+\n #include <libcamera/formats.h>\n \n #include \"libcamera/internal/bayer_format.h\"\n@@ -718,6 +721,17 @@ void DebayerCpu::process4(const uint8_t *src, uint8_t *dst)\n \t}\n }\n \n+static 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+\n+\t\tif (ioctl(fd, DMA_BUF_IOCTL_SYNC, &sync) < 0)\n+\t\t\tLOG(Debayer, Error) << \"Syncing buffer FD \" << fd << \"failed: \" << errno;\n+\t}\n+}\n+\n static inline int64_t timeDiff(timespec &after, timespec &before)\n {\n \treturn (after.tv_sec - before.tv_sec) * 1000000000LL +\n@@ -733,6 +747,9 @@ void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams\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+\n \tgreen_ = params.green;\n \tred_ = swapRedBlueGains_ ? params.blue : params.red;\n \tblue_ = swapRedBlueGains_ ? params.red : params.blue;\n@@ -760,6 +777,9 @@ void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams\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+\n \t/* Measure before emitting signals */\n \tif (measuredFrames_ < DebayerCpu::kLastFrameToMeasure &&\n \t ++measuredFrames_ > DebayerCpu::kFramesToSkip) {\n", "prefixes": [ "v3" ] }