From patchwork Wed Nov 18 13:15:18 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Plowman X-Patchwork-Id: 29015 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 80EA1BDE17 for ; Wed, 18 Nov 2026 14:07:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D4F026A8D9; Wed, 18 Nov 2026 15:07:28 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="kkPOhNmZ"; dkim-atps=neutral Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0EB666A8C7 for ; Wed, 18 Nov 2026 15:07:24 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-4bb6057b333so5070525e9.3 for ; Wed, 18 Nov 2026 06:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1795010843; x=1795615643; 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:content-type; bh=1G9J//RSq63KfifC7BSC24aLW/Knv+o8XVYldXoo9rg=; b=kkPOhNmZRVgPv4tcjMElHTozQZHQ6skMaAS8cGgAyxCOD0zTuM5M2j5gvUXVmoXCIB k5779R2x3/xKF7ZpxEwoYfDMZ44u1bt43oTPk+ylFf8ljcvrLLPEJkMu1+vWToU7qlOC XSu9rVp33hSsEezW7ykCpYgVInlkzSHssfSd4MVz0zgYnAxiVw6uIW2yl3OIa7Iqz4hx smovcnT3Fxg/IS7Ehetso+b9wjS60oHXiN6V9e6ZLtEJIhzX92EmD8TeVaRZYUDk2nMK tXKlRFj/nE0t5qMs328K77vElHl21Ug7w32eSSF3ocQ+fJHTVQg7MSHEYxbV3JEWcaR/ XBWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795010843; x=1795615643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=1G9J//RSq63KfifC7BSC24aLW/Knv+o8XVYldXoo9rg=; b=I8r3D4m0x2aOtshdLbmTuz+qLyhcr/VMd7Fo01SpamH6zjkKoyQBFZGSVrAjyTV1OP VtDfrSmQNFCxbRuaCGyY8odkL1+zVoPY7bC97Xk44rtE6m3Miac/t3rvLXYjPdJof9H2 jyaz21VQl5Cb9F8CQ/p4wVbrtsnIMz9QN3ZILj9f1HY4fo7OvRbjEY+He/UiEflK4ks9 6kOvJRFW0S0gasnOpS5kIj8NmoCj4zW4O0hCUFHd+mqD+61lI5mj5qnU6K4vKhHUK63U fhqGBB+TcxEtp9Hy2fF2XvDb44ZWRpHPhB75bin6EQeRxmJq7Uzg2DuK3lszHcqeZXvQ Bi0g== X-Gm-Message-State: APuU4Z9lTzc6sjCvso5VHdawIlMFK41/9XehLrT8TWFQHsvfhDMKWMtZ OtC20CgqJH+qpw2/KYuDpOLCVyx4am0RPVDuagrAfIKdvMD8vbqpkniINvGTN3fYwcZmppYjIFJ QYOt2 X-Gm-Gg: AYBFou0d0alyT3928A1Nvg7o8k7E5UNEU3JZCU1g4kPaSvkgeJ7Vopbqy6YgEtpOdkb LOZsqtEKR3CzEiBhj+g9hYF5xeL94lJSiYlDE0R5UXHHnTbu90zbe/nyRbyDkRXhY+oamn+kO/J Xp9wnz0Kyw7yPRZ1TY5s2zEfWi55pHmfIEovALH3GSVN0rFqPswHCFEMmvFUKxDl0RGUPRoqhTe OTpJD6IzlZ0tJ+jU1hd8Pk4reIWJ9+l7IS37kfxtzs4j7t002cZ1WH3g2q+a7WptKb4MJmPRXJh bcJCLrKOpYYRXaskkPkmki7yk5vKbG5ZvMDfT/UnZvT0oPpZivs4o5Ui6WhKucja6ORyytkS80A XNvV8UcuBPgzXu0lRK9jXrisXNCnYcXdjEJkeZzt2+aDZBVPmPDzcD/UFLNs8bP3GsMu75DH8eH 3QVSKRZDSFeyk4Jn4/iKF2d3M2CPBOm41/Hy2FtmMjvlfiX2O3Puz8GUFetClUvdup9ORsGSNek G5r0jfKD76dbDkmG0lJkoIJRdVTYpjhwiov7Ce7/3szICvgidhnOqJOgzex3KT2/K8M17U17A0E KeUda8/wZjntn4+teIqR0Ndz/8nTCCr3HCfuIUgu6wPKG9zTyG0w5yNNwffo2igpi0CNDo70G7H 8PfM6LnygBV7pX8yNXV4t9AZMhu7WrBPcljXEJ+R82aPqWzM= X-Received: by 2002:a05:600c:8b05:b0:4a3:12fb:1ef1 with SMTP id 5b1f17b1804b1-4bb7da26eacmr50652115e9.29.1795010843337; Wed, 18 Nov 2026 06:07:23 -0800 (PST) Received: from davidp-hailo.pitowers.org ([2a00:1098:3142:1f:2ecf:67ff:fe94:e2e6]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4bb7d29c7b7sm55274085e9.5.2026.11.18.06.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 06:07:23 -0800 (PST) From: David Plowman To: libcamera-devel@lists.libcamera.org Cc: David Plowman Subject: [PATCH v1 2/3] ipa: rpi: Memory map raw stream buffers Date: Wed, 18 Nov 2026 13:15:18 +0000 Message-ID: <20261118140719.46849-3-david.plowman@raspberrypi.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118140719.46849-1-david.plowman@raspberrypi.com> References: <20261118140719.46849-1-david.plowman@raspberrypi.com> 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" We memory map the raw stream buffers and track their fds, so that the raw stream buffer, plus its shared fd, can in future be passed to control algorithms (the fd is provided for DMA sync operations). This will support future IPAs that may want to "pixel peep" at the raw image data. Signed-off-by: David Plowman --- src/ipa/rpi/common/ipa_base.cpp | 6 ++-- src/ipa/rpi/common/ipa_base.h | 2 ++ .../pipeline/rpi/common/pipeline_base.cpp | 30 ++++++++++++++++++- .../pipeline/rpi/common/pipeline_base.h | 1 + 4 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp index 2ed80d3e..6707ab11 100644 --- a/src/ipa/rpi/common/ipa_base.cpp +++ b/src/ipa/rpi/common/ipa_base.cpp @@ -392,17 +392,15 @@ void IpaBase::mapBuffers(const std::vector &buffers) const FrameBuffer fb(buffer.planes); buffers_.emplace(buffer.id, MappedFrameBuffer(&fb, MappedFrameBuffer::MapFlag::ReadWrite)); + buffersFds_.emplace(buffer.id, buffer.planes[0].fd); } } void IpaBase::unmapBuffers(const std::vector &ids) { for (unsigned int id : ids) { - auto it = buffers_.find(id); - if (it == buffers_.end()) - continue; - buffers_.erase(id); + buffersFds_.erase(id); } } diff --git a/src/ipa/rpi/common/ipa_base.h b/src/ipa/rpi/common/ipa_base.h index 0d7842f1..e3d8c3e6 100644 --- a/src/ipa/rpi/common/ipa_base.h +++ b/src/ipa/rpi/common/ipa_base.h @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -104,6 +105,7 @@ private: void applyAGC(struct AgcStatus *agcStatus, ControlList &ctrls); std::map buffers_; + std::map buffersFds_; bool lensPresent_; bool monoSensor_; diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp index 6944d5c4..6dc91a47 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp @@ -690,6 +690,9 @@ int PipelineHandlerBase::start(Camera *camera, const ControlList *controls) data->buffersAllocated_ = true; } + /* Map any Bayer buffers for IPAs that might want to "pixel peep". */ + mapBayerBuffers(camera); + ret = queueAllBuffers(camera); if (ret) { LOG(RPI, Error) << "Failed to queue buffers"; @@ -775,6 +778,10 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request) * so we can track it. */ stream->setExportedBuffer(buffer); + + /* Map any new Bayer buffers. */ + if (data->frontendDevice() == stream->dev()) + mapBayerBuffers(camera); } /* @@ -910,6 +917,10 @@ void PipelineHandlerBase::mapBuffers(Camera *camera, const BufferMap &buffers, u * handler and the IPA. */ for (const auto &[id, buffer] : buffers) { + /* Not essential, but avoids churn for buffers we already know about. */ + if (data->bufferIds_.contains(mask | id)) + continue; + std::span planes = buffer.buffer->planes(); bufferIds.emplace_back(mask | id, @@ -917,7 +928,24 @@ void PipelineHandlerBase::mapBuffers(Camera *camera, const BufferMap &buffers, u data->bufferIds_.insert(mask | id); } - data->ipa_->mapBuffers(bufferIds); + if (!bufferIds.empty()) + data->ipa_->mapBuffers(bufferIds); +} + +/* + * Map all the Bayer buffers to the IPA, for any IPAs that may want to + * pixel-peep. Buffers that are already mapped are skipped. + */ +void PipelineHandlerBase::mapBayerBuffers(Camera *camera) +{ + CameraData *data = cameraData(camera); + + for (const auto stream : data->streams_) { + if (stream->dev() == data->frontendDevice()) { + mapBuffers(camera, stream->getBuffers(), RPi::MaskBayerData); + break; + } + } } int PipelineHandlerBase::queueAllBuffers(Camera *camera) diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.h b/src/libcamera/pipeline/rpi/common/pipeline_base.h index 7b872555..c027c235 100644 --- a/src/libcamera/pipeline/rpi/common/pipeline_base.h +++ b/src/libcamera/pipeline/rpi/common/pipeline_base.h @@ -245,6 +245,7 @@ protected: MediaEntity *sensorEntity); void mapBuffers(Camera *camera, const BufferMap &buffers, unsigned int mask); + void mapBayerBuffers(Camera *camera); virtual int platformRegister(std::unique_ptr &cameraData, std::shared_ptr unicam,