From patchwork Thu Nov 21 05:51:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cheng-Hao Yang X-Patchwork-Id: 22053 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id B0051C32FB for ; Thu, 21 Nov 2024 05:54:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EA46A65FAA; Thu, 21 Nov 2024 06:54:54 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bZQNtpja"; dkim-atps=neutral Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B35D565FA1 for ; Thu, 21 Nov 2024 06:54:46 +0100 (CET) Received: by mail-pg1-x529.google.com with SMTP id 41be03b00d2f7-7f12ba78072so463545a12.2 for ; Wed, 20 Nov 2024 21:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1732168485; x=1732773285; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=36dmZHlgBtkx0ifRAWdxsru0TSO9A+QrGioh6Y9/Qzg=; b=bZQNtpjaORtCxZnMqAa/Z5KYRI28MuQtGNJo4wwPTpizX79PO8O5ALAu2kdaMmrsV0 VQfqcYH+ivRx3HgJEKHd4dFVfkFqqJ/BNnv6YGMr1YIJngJMH+Q/0zzHMcLgmEoz2Mqt KeQ7xDm3wBBi2KCEqLcqs85oNtj5Sj0QR7Zts= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732168485; x=1732773285; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=36dmZHlgBtkx0ifRAWdxsru0TSO9A+QrGioh6Y9/Qzg=; b=MRlp7u4S8YM6xk1bKdBpczXegBqBleYmAhslHoARaS1BWZgXVAFjK6JoHNbDXoDLcL aSaCLiHxa8NW7NtdGZqBCQHID1j822VEr5pDRYYVpGvjvDakRyaZ0KEFmkOxWJIs57Da hM1bUwjY/9Bq+TL96ANoBKj6RifdnKuB6u1sqSoGlGUHUFFpl3ALbe4q3qcHjT4vz5b3 35Pj7a/SGkwnpaYShr2KG2qZI5rt7a18+8fitSb+iuk2lVTZ3BiL6smW5RBUkrKbK2RX Blnc3Rx+4MS/UVTb6TqvwWxQFuPRQg0XiHBswWdM/YHNufLeX6gsOSfDUGR/ReBSsLXF MYHQ== X-Gm-Message-State: AOJu0YzuQayzfcLOcd50+KpfxycdrrR5NtQwfjEzXRSJbXAyaY1m0+3r UsoT97iCxpq8n7rPgfPX9XG9fpAxjLLaX9EEyrz4pMWmHkMWlMUcuAc3t2l45dq4V1Sd5yUxKew = X-Gm-Gg: ASbGncslVxfeSs6zj2ZFEATEvA6TQpppjPqX9FW1O6oWVfLrWxKPOZ3MFGwQZknFtvB MqJqD2YE/PY22HiAPNq0XBYy7RP33HtPzhoI8WRQsKzW2wfCIqgncpGj2P8ZA+HDybdAxid2vyZ jRF+PL8BMPbDzyFCL0zzeG8DLPvD+Y+wX363J5ctWxlcJTxUcz/lIhfi/f9eX2twKj3tPK3Hz1e hcV5efNm3SzquqUVQO4NjRaFbuOsUIZyfCOBlYaCpkCmXDHEhs+zlxqJK0nQ5A2+HWTGAO1ZobH Qftc2nkDLmiQQDQv8pa+DOde5Lo4Gu6NCalnCVPIHA20iav2IX3mRw== X-Google-Smtp-Source: AGHT+IEck272V8QSYgGaT0IP53mYOxFHxodGWIyvnrurE6XAZ5SQsV2iksO5jDDTV3DrMyBfUPs5wQ== X-Received: by 2002:a05:6a20:7347:b0:1dc:77fc:1cdb with SMTP id adf61e73a8af0-1ddae4e291dmr6824895637.13.1732168484752; Wed, 20 Nov 2024 21:54:44 -0800 (PST) Received: from chenghaoyang-low.c.googlers.com.com (27.247.221.35.bc.googleusercontent.com. [35.221.247.27]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-724bef8da82sm2815815b3a.124.2024.11.20.21.54.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 21:54:43 -0800 (PST) From: Harvey Yang To: libcamera-devel@lists.libcamera.org Cc: Harvey Yang , Milan Zamazal 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 X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" As there's an existing helper class DmaSyncer that makes synchronizing DMABUFs more easily, this patch removes the self-defined function and reuse DmaSyncer. Signed-off-by: Harvey Yang Reviewed-by: Milan Zamazal Reviewed-by: Kieran Bingham --- src/libcamera/software_isp/debayer_cpu.cpp | 29 ++++++---------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index cf5ecdf7a..31ab96ab3 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -20,6 +20,7 @@ #include #include "libcamera/internal/bayer_format.h" +#include "libcamera/internal/dma_buf_allocator.h" #include "libcamera/internal/framebuffer.h" #include "libcamera/internal/mapped_framebuffer.h" @@ -722,23 +723,6 @@ void DebayerCpu::process4(const uint8_t *src, uint8_t *dst) namespace { -void syncBufferForCPU(FrameBuffer *buffer, uint64_t syncFlags) -{ - for (const FrameBuffer::Plane &plane : buffer->planes()) { - const int fd = plane.fd.get(); - struct dma_buf_sync sync = { syncFlags }; - int ret; - - ret = ioctl(fd, DMA_BUF_IOCTL_SYNC, &sync); - if (ret < 0) { - ret = errno; - LOG(Debayer, Error) - << "Syncing buffer FD " << fd << " with flags " - << syncFlags << " failed: " << strerror(ret); - } - } -} - inline int64_t timeDiff(timespec &after, timespec &before) { return (after.tv_sec - before.tv_sec) * 1000000000LL + @@ -756,8 +740,12 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output clock_gettime(CLOCK_MONOTONIC_RAW, &frameStartTime); } - syncBufferForCPU(input, DMA_BUF_SYNC_START | DMA_BUF_SYNC_READ); - syncBufferForCPU(output, DMA_BUF_SYNC_START | DMA_BUF_SYNC_WRITE); + std::vector dmaSyncers; + for (const FrameBuffer::Plane &plane : input->planes()) + dmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Read); + + for (const FrameBuffer::Plane &plane : output->planes()) + dmaSyncers.emplace_back(plane.fd, DmaSyncer::SyncType::Write); green_ = params.green; red_ = swapRedBlueGains_ ? params.blue : params.red; @@ -786,8 +774,7 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output metadata.planes()[0].bytesused = out.planes()[0].size(); - syncBufferForCPU(output, DMA_BUF_SYNC_END | DMA_BUF_SYNC_WRITE); - syncBufferForCPU(input, DMA_BUF_SYNC_END | DMA_BUF_SYNC_READ); + dmaSyncers.clear(); /* Measure before emitting signals */ if (measuredFrames_ < DebayerCpu::kLastFrameToMeasure &&