Patch Detail
Show a patch.
GET /api/1.1/patches/24361/?format=api
{ "id": 24361, "url": "https://patchwork.libcamera.org/api/1.1/patches/24361/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24361/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20250912142915.53949-11-mzamazal@redhat.com>", "date": "2025-09-12T14:29:11", "name": "[v18,09/12] libcamera: software_isp: Make input buffer copying configurable", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "8486d0f50d5d0950d7c3e44a95e125f6a69c29ca", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24361/mbox/", "series": [ { "id": 5441, "url": "https://patchwork.libcamera.org/api/1.1/series/5441/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5441", "date": "2025-09-12T14:29:01", "name": "Add global configuration file", "version": 18, "mbox": "https://patchwork.libcamera.org/series/5441/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24361/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24361/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 CACE5BDB13\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 12 Sep 2025 14:30:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7ACD169386;\n\tFri, 12 Sep 2025 16:30:01 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D25A6937D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 12 Sep 2025 16:29:59 +0200 (CEST)", "from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-202--V-H67OcPhKWvGKxuIYErA-1;\n\tFri, 12 Sep 2025 10:29:53 -0400", "from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.93])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 515551944DC8; Fri, 12 Sep 2025 14:29:52 +0000 (UTC)", "from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.45.224.48])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id F1D7C1800447; Fri, 12 Sep 2025 14:29:49 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"gtdMeU6p\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1757687398;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=G0eB4l70Q/WXFCStedrJL7fziK2jzThhBecL8wx00EU=;\n\tb=gtdMeU6pZZ5zRx4F/SvGmzAQyJtI3jOeGxTff/bWkrrThEBgli2SR8Bogui6Vns3fyISNF\n\tniSLMAVa7rFjfJCcACmnaAidKKgEUd11yAGeGhR+dXXcFStvfKMpJRlbUI9D7yzGo17iMi\n\til524AIDm+UK928ReqmURDNkNAXmAMU=", "X-MC-Unique": "-V-H67OcPhKWvGKxuIYErA-1", "X-Mimecast-MFC-AGG-ID": "-V-H67OcPhKWvGKxuIYErA_1757687392", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>, Kieran Bingham\n\t<kieran.bingham@ideasonboard.com>, =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?=\n\t<barnabas.pocze@ideasonboard.com>, Laurent Pinchart\n\t<laurent.pinchart@ideasonboard.com>, Paul Elder\n\t<paul.elder@ideasonboard.com>", "Subject": "[PATCH v18 09/12] libcamera: software_isp: Make input buffer copying\n\tconfigurable", "Date": "Fri, 12 Sep 2025 16:29:11 +0200", "Message-ID": "<20250912142915.53949-11-mzamazal@redhat.com>", "In-Reply-To": "<20250912142915.53949-1-mzamazal@redhat.com>", "References": "<20250912142915.53949-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.93", "X-Mimecast-Spam-Score": "0", "X-Mimecast-MFC-PROC-ID": "tvMJw_GuBxw2P7sfc6OL8KZoEVNXjJWPKamMU3lrVCw_1757687392", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "content-type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "On some platforms, working directly on the input buffer is very slow due\nto disabled caching. This is why we copy the input buffer into standard\n(cached) memory. This is an unnecessary overhead on platforms with\ncached buffers.\n\nLet's make input buffer copying configurable. The default is still\ncopying, as its overhead is much lower than contingent operations on\nnon-cached memory. Ideally, we should improve this in future to set the\ndefault to non-copying if we can be sure under observable circumstances\nthat we are working with cached buffers.\n\nCompletes software ISP TODO #6.\n\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n Documentation/runtime_configuration.rst | 13 +++++++++++++\n src/libcamera/software_isp/TODO | 11 -----------\n src/libcamera/software_isp/debayer_cpu.cpp | 7 +++++--\n src/libcamera/software_isp/debayer_cpu.h | 3 ++-\n src/libcamera/software_isp/software_isp.cpp | 3 ++-\n 5 files changed, 22 insertions(+), 15 deletions(-)", "diff": "diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex 8792232d7..6610e8bec 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -55,6 +55,8 @@ file structure:\n supported_devices:\n - driver: # driver name, e.g. `mxc-isi`\n software_isp: # true/false\n+ software_isp:\n+ copy_input_buffer: # true/false\n \n Configuration file example\n --------------------------\n@@ -88,6 +90,8 @@ Configuration file example\n supported_devices:\n - driver: mxc-isi\n software_isp: true\n+ software_isp:\n+ copy_input_buffer: false\n \n List of variables and configuration options\n -------------------------------------------\n@@ -154,6 +158,15 @@ pipelines.simple.supported_devices.driver, pipelines.simple.supported_devices.so\n \n Example `software_isp` value: ``true``\n \n+software_isp.copy_input_buffer\n+ Define whether input buffers should be copied into standard (cached)\n+ memory in software ISP. This is done by default to prevent very slow\n+ processing on platforms with non-cached buffers. It can be set to\n+ false on platforms with cached buffers to avoid an unnecessary\n+ overhead.\n+\n+ Example value: ``false``\n+\n Further details\n ---------------\n \ndiff --git a/src/libcamera/software_isp/TODO b/src/libcamera/software_isp/TODO\nindex a50db668e..2c919f442 100644\n--- a/src/libcamera/software_isp/TODO\n+++ b/src/libcamera/software_isp/TODO\n@@ -71,17 +71,6 @@ per-frame buffers like we do for hardware ISPs.\n \n ---\n \n-6. Input buffer copying configuration\n-\n-> DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats)\n-> \t: stats_(std::move(stats)), gammaCorrection_(1.0)\n-> {\n-> \tenableInputMemcpy_ = true;\n-\n-Set this appropriately and/or make it configurable.\n-\n----\n-\n 7. Performance measurement configuration\n \n > void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams params)\ndiff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp\nindex 66f6038c1..cec6cc6be 100644\n--- a/src/libcamera/software_isp/debayer_cpu.cpp\n+++ b/src/libcamera/software_isp/debayer_cpu.cpp\n@@ -24,6 +24,7 @@\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/global_configuration.h\"\n #include \"libcamera/internal/mapped_framebuffer.h\"\n \n namespace libcamera {\n@@ -38,8 +39,9 @@ namespace libcamera {\n /**\n * \\brief Constructs a DebayerCpu object\n * \\param[in] stats Pointer to the stats object to use\n+ * \\param[in] configuration The global configuration\n */\n-DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats)\n+DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats, const GlobalConfiguration &configuration)\n \t: stats_(std::move(stats))\n {\n \t/*\n@@ -50,7 +52,8 @@ DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats)\n \t * always set it to true as the safer choice but this should be changed in\n \t * future.\n \t */\n-\tenableInputMemcpy_ = true;\n+\tenableInputMemcpy_ =\n+\t\tconfiguration.option<bool>({ \"software_isp\", \"copy_input_buffer\" }).value_or(true);\n \n \t/* Initialize color lookup tables */\n \tfor (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) {\ndiff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h\nindex 926195e98..2f35aa18b 100644\n--- a/src/libcamera/software_isp/debayer_cpu.h\n+++ b/src/libcamera/software_isp/debayer_cpu.h\n@@ -18,6 +18,7 @@\n #include <libcamera/base/object.h>\n \n #include \"libcamera/internal/bayer_format.h\"\n+#include \"libcamera/internal/global_configuration.h\"\n \n #include \"debayer.h\"\n #include \"swstats_cpu.h\"\n@@ -27,7 +28,7 @@ namespace libcamera {\n class DebayerCpu : public Debayer, public Object\n {\n public:\n-\tDebayerCpu(std::unique_ptr<SwStatsCpu> stats);\n+\tDebayerCpu(std::unique_ptr<SwStatsCpu> stats, const GlobalConfiguration &configuration);\n \t~DebayerCpu();\n \n \tint configure(const StreamConfiguration &inputCfg,\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 28e2a360e..b7651b7d2 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -114,7 +114,8 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n \t}\n \tstats->statsReady.connect(this, &SoftwareIsp::statsReady);\n \n-\tdebayer_ = std::make_unique<DebayerCpu>(std::move(stats));\n+\tconst GlobalConfiguration &configuration = pipe->cameraManager()->_d()->configuration();\n+\tdebayer_ = std::make_unique<DebayerCpu>(std::move(stats), configuration);\n \tdebayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady);\n \tdebayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);\n \n", "prefixes": [ "v18", "09/12" ] }