From patchwork Sun Aug 24 00:48:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 24193 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 CEFBCC32BB for ; Sun, 24 Aug 2025 00:48:59 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6383B692F7; Sun, 24 Aug 2025 02:48:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="rtzYDCwb"; dkim-atps=neutral Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 36EDB692E2 for ; Sun, 24 Aug 2025 02:48:46 +0200 (CEST) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3c6ae25978bso1067835f8f.0 for ; Sat, 23 Aug 2025 17:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755996526; x=1756601326; darn=lists.libcamera.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ljHxrgf3vZvddQcR/4+c7ZdyCTTapW6dccH8trXoUgo=; b=rtzYDCwbAmp/QxYJSzKmAZjUfjkkJnAC8iyvEtHQT6VUqiQKQzQhE9UASKCsgObBbr V7966q64Nup7VY9QfSIBi9PBOmYUPu4N/vvEwsx+4guOqmXxBYhQaS/o9YkdYytStCtX DJSIJi9AXTWAcE1PtCVI1/987tthW09IM+0XYqtqwx9c+EKtBASj7YhC/9wY1+e6r7lE ckplbHLDEscXxT/XtzUWHKadqcE/P9SGHieX79VW2zEdzwQcGUCFJN+6bZ32jZONCGmc hTy7j4CIik5P9h5NCdHplisaoDze5GUl5OO6KtA830r9REXqcaQenWcGj8EG1MoWaTk+ qcHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755996526; x=1756601326; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ljHxrgf3vZvddQcR/4+c7ZdyCTTapW6dccH8trXoUgo=; b=GouO7DSedz8D8iUN4lOJMODZEh3o2vOpegYgoi3H4ZZ0UkSRm1oOZFib/LVfJ6ElWE Q0AKbvo2miI8Q50dljAhcee+VJ3v3DyRs0nwXdRmjsxW28Hqz+/nSJfurMAVyISBoBAY z2OyLA2cQem4Ieykx5l0E7n9wnK8ipxoyaEly7u5OyMtWmZkKQv1cELbPXP+aewParYb qKJfGSsi5JkOhPnT93w16mpUw3RLTO2obv0sNK7JU/ISGS/VWBXcdRgnrXP3ScD56UQP epgZ6mhXR8PaseTVCE7KdYN6wWICGTytd6/1E1z5M1NoQXfvvpiX5H55ttmQ8VXDgouv ir4Q== X-Gm-Message-State: AOJu0YzCARA+Bc+ib+wUv+6SxyXZkauzTraon5vMDwsYqpum47QJQj1Z fwnDdVa8Y2smo0S1AzNCBkCw7joEQzaV5+EpH8d98oV0kZliRhx1bQK9yHcxk9FE7oVvGfG6jto S/sgMgVI= X-Gm-Gg: ASbGncuQxXWfmM1q4F/BCmy0kkJ4B8W4gNmRo5iGr4kWyVRqPj3DeQ5cgU6LEN1zA6o v4qya/HY8a3IF1Ut6ReNMop4aeTSu4cCz8nhnsdpUbQ++QIzb6SHfyKKdSCTtaReCXfXCnNbqND Lu2u9I5U1cyQaNulUMDtIlShzmlt/87jaNa24lNZWJtjS4luU7gnmfPUjzWxfcMMNJa2vQYaLUD 7DfYgJTl32fxcLwgqA2DQPSX4IWrTM6ECwfY034Ey2K6LJ2yXDYewHyZDQlmGwRZlx1o8qFYDkO pUYkKSBHUHnpBluB6mkJSMBOZPAGpMkLq/ZuHAU5YMJVEQtt+rkMZ7+Ew949ghn66yO4LfwxcO6 L38GQjYoqeI7COLBM/AA3utBecPZR2Y2+i8S+I5SZ/k1rD/s+9ziiB5qONK9Qj8KKe6XF+M4t6P +li43aG4+AidtEFWVXnHNu X-Google-Smtp-Source: AGHT+IHiwnoFbPKEtdZGCt1uh+N1+bkxc1Ggnw5aDqBq0a7xCPAhiyRKaI1PKa2WNUO2Sn3FehphWQ== X-Received: by 2002:a05:6000:2f81:b0:3c3:7cba:6d18 with SMTP id ffacd0b85a97d-3c5dd6bbcffmr4802218f8f.55.1755996525612; Sat, 23 Aug 2025 17:48:45 -0700 (PDT) Received: from [192.168.0.13] (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b4e1d530esm69347225e9.0.2025.08.23.17.48.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 17:48:45 -0700 (PDT) From: Bryan O'Donoghue Date: Sun, 24 Aug 2025 01:48:22 +0100 Subject: [PATCH v2 10/37] libcamera: software_isp: Move DMA Sync code to Debayer base class MIME-Version: 1.0 Message-Id: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-10-96f4576c814e@linaro.org> References: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> In-Reply-To: <20250824-b4-v0-5-2-gpuisp-v2-a-v2-0-96f4576c814e@linaro.org> To: libcamera-devel@lists.libcamera.org Cc: Bryan O'Donoghue X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3124; i=bryan.odonoghue@linaro.org; h=from:subject:message-id; bh=rTghYOVfOgNztjAsM9CLcURyL9hv4snptnXuCiaB0w4=; b=owEBbQKS/ZANAwAKASJxO7Ohjcg6AcsmYgBoqmFeX1fb9ALVtB1N0+AmBzwxeX8HY+16k21N7 yscyrcrjcWJAjMEAAEKAB0WIQTmk/sqq6Nt4Rerb7QicTuzoY3IOgUCaKphXgAKCRAicTuzoY3I OqTgD/4k84tx6SeH5JbiA+OJaY0kFn4zX9bzoYrqUGwdvc67+kd0Veic/wX2oVjH79OtLc6yllr LJ8LHWbNnax7e0mqgHd34W+xSX3zPF/CIvrfaRck6Xu3WPw9NamjSYbne7P+GHkdgknvxVmhMnY +CjzUh5auaNqZlXjPxJtII46l2bmCXBZ91HiaMu+N+QDUZYI2Ai7W+8xCX0SdGOwDbVeMP4wyDK YotpZpH2SfEeq6cu/elNKDzGrrfnzu+Km/AdoK3KTmIpRXRe38vAHyhhB+xkQ7ZPykSONTIZMX+ VKE4LCJ36A8XaSMO2BYWar3BVEmr87/RV4jG6P6noQJ1nlzBpKmOHw7hJbJW8umTJd5GOOA82Oz YPnEt8muHR3VRkZtNPNrMc8Y5jMeIgISqbkTEnh2Cq1Q9Oxg7ryK6KUtmTD+cjfijT5QmiXlqzk uBTn1VIV68jILATH415IsIDnFrgUDgWvTnqoPipepWDTdJ8RZ3rHbVumU89pSK20Ko9qBdZMB4U Fd3BJhGmiMjjfzOFmWet3Z7iK9lrBMHeTTcBO2tO8SqWIaA0iTvo15SNlolR7xSEDYQJHIz+sMQ Y4A+QwiquSOaWfBETV+mvZfkTDaA8N9y5cVnUy3i0GWiEpTG2JajiMgH7jITciqv91iBDvThJ2C jGI0vLocL+TJEqA== X-Developer-Key: i=bryan.odonoghue@linaro.org; a=openpgp; fpr=E693FB2AABA36DE117AB6FB422713BB3A18DC83A 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" We can reuse the DMA Sync code in the GPUISP. Move the code we need to the base class. Signed-off-by: Bryan O'Donoghue Reviewed-by: Milan Zamazal --- src/libcamera/software_isp/debayer.cpp | 13 +++++++++++++ src/libcamera/software_isp/debayer.h | 2 ++ src/libcamera/software_isp/debayer_cpu.cpp | 6 +----- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp index fc2438c0d0161a36da2769d95836f282836b143d..75e4bffab0f082bdf6e5bdf3030b9f49d4877524 100644 --- a/src/libcamera/software_isp/debayer.cpp +++ b/src/libcamera/software_isp/debayer.cpp @@ -214,4 +214,17 @@ void Debayer::setParams(DebayerParams ¶ms) gammaLut_ = params.gammaLut; } +/** + * \fn void Debayer::dmaSyncBegin(DebayerParams ¶ms) + * \brief Common CPU/GPU Dma Sync Buffer begin + */ +void Debayer::dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *input, FrameBuffer *output) +{ + 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); +} + } /* namespace libcamera */ diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h index 5f692bcbdeec1447c596ebbdc984585948a34880..0af66b556bbf8993a66042a3a76cd50582209bce 100644 --- a/src/libcamera/software_isp/debayer.h +++ b/src/libcamera/software_isp/debayer.h @@ -20,6 +20,7 @@ #include #include +#include "libcamera/internal/dma_buf_allocator.h" #include "libcamera/internal/software_isp/benchmark.h" #include "libcamera/internal/software_isp/debayer_params.h" @@ -85,6 +86,7 @@ private: protected: void setParams(DebayerParams ¶ms); + void dmaSyncBegin(std::vector &dmaSyncers, FrameBuffer *input, FrameBuffer *output); }; } /* namespace libcamera */ diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp index 6ed17e9fc144bc7c3472d999b1e9c23236020963..9fce2a143ac9585eadcea41744d680bc9589c507 100644 --- a/src/libcamera/software_isp/debayer_cpu.cpp +++ b/src/libcamera/software_isp/debayer_cpu.cpp @@ -22,7 +22,6 @@ #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" @@ -740,11 +739,8 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output bench_.startFrame(); 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); + dmaSyncBegin(dmaSyncers, input, output); setParams(params);