[{"id":32333,"web_url":"https://patchwork.libcamera.org/comment/32333/","msgid":"<173219152689.2888836.3384321771306497303@ping.linuxembedded.co.uk>","date":"2024-11-21T12:18:46","subject":"Re: [PATCH v3 2/2] debayer_cpu: Replace syncing DMABUFs with\n\tDmaSyncer","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Harvey Yang (2024-11-21 05:51:32)\n> As there's an existing helper class DmaSyncer that makes synchronizing\n> DMABUFs more easily, this patch removes the self-defined function and\n> reuse DmaSyncer.\n> \n> Signed-off-by: Harvey Yang \n> Reviewed-by: Milan Zamazal \n\n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/libcamera/software_isp/debayer_cpu.cpp | 29 ++++++----------------\n> 1 file changed, 8 insertions(+), 21 deletions(-)\n> \n> diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\n> index 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 \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> - for (const FrameBuffer::Plane &plane : buffer->planes()) {\n> - const int fd = plane.fd.get();\n> - struct dma_buf_sync sync = { syncFlags };\n> - int ret;\n> -\n> - ret = ioctl(fd, DMA_BUF_IOCTL_SYNC, &sync);\n> - if (ret < 0) {\n> - ret = errno;\n> - LOG(Debayer, Error)\n> - << \"Syncing buffer FD \" << fd << \" with flags \"\n> - << syncFlags << \" failed: \" << strerror(ret);\n> - }\n> - }\n> -}\n> -\n> inline int64_t timeDiff(timespec &after, timespec &before)\n> {\n> return (after.tv_sec - before.tv_sec) * 1000000000LL +\n> @@ -756,8 +740,12 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n> clock_gettime(CLOCK_MONOTONIC_RAW, &frameStartTime);\n> }\n> \n> - syncBufferForCPU(input, DMA_BUF_SYNC_START | DMA_BUF_SYNC_READ);\n> - syncBufferForCPU(output, DMA_BUF_SYNC_START | DMA_BUF_SYNC_WRITE);\n> + std::vector dmaSyncers;\n> + for (const FrameBuffer::Plane &plane : input->planes())\n> + dmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Read);\n> +\n> + for (const FrameBuffer::Plane &plane : output->planes())\n> + dmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write);\n> \n> green_ = params.green;\n> red_ = swapRedBlueGains_ ? params.blue : params.red;\n> @@ -786,8 +774,7 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output\n> \n> metadata.planes()[0].bytesused = out.planes()[0].size();\n> \n> - syncBufferForCPU(output, DMA_BUF_SYNC_END | DMA_BUF_SYNC_WRITE);\n> - syncBufferForCPU(input, DMA_BUF_SYNC_END | DMA_BUF_SYNC_READ);\n> + dmaSyncers.clear();\n> \n> /* Measure before emitting signals */\n> if (measuredFrames_ < DebayerCpu::kLastFrameToMeasure &&\n> -- \n> 2.47.0.338.g60cca15819-goog\n>","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 D3000C32F9\n\tfor ;\n\tThu, 21 Nov 2024 12:18:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8E0E165FC8;\n\tThu, 21 Nov 2024 13:18:51 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AD09465FBC\n\tfor ;\n\tThu, 21 Nov 2024 13:18:49 +0100 (CET)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E9B82219;\n\tThu, 21 Nov 2024 13:18:30 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"TiXO+sAt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1732191511;\n\tbh=QPCoxDbbzYTWJ2Aqx5tQpW+76Y8cCBhOr/qGcvuF/AM=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=TiXO+sAtEAnvwNaezUo+kHKa4c3/OELwb4osJYo5r+/R8oJcC3HOtkSvTfSZEeXQA\n\tSQpQQoh0JJXQ3JIzdzGrCMUgAMoL5guDmCrOeG99XqVYWnWJICsnivsBWMz8YTmllI\n\tIYTeYoYxf1hfry0+Uh6nqwmg8/9nM+RQ2btW12Xw=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20241121055436.2502314-3-chenghaoyang@chromium.org>","References":"<20241121055436.2502314-1-chenghaoyang@chromium.org>\n\t<20241121055436.2502314-3-chenghaoyang@chromium.org>","Subject":"Re: [PATCH v3 2/2] debayer_cpu: Replace syncing DMABUFs with\n\tDmaSyncer","From":"Kieran Bingham ","Cc":"Harvey Yang ,\n\tMilan Zamazal ","To":"Harvey Yang ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Thu, 21 Nov 2024 12:18:46 +0000","Message-ID":"<173219152689.2888836.3384321771306497303@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}}]