{"id":23816,"url":"https://patchwork.libcamera.org/api/patches/23816/?format=json","web_url":"https://patchwork.libcamera.org/patch/23816/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20250715081921.5522-10-mzamazal@redhat.com>","date":"2025-07-15T08:19:16","name":"[v14,09/12] libcamera: software_isp: Make input buffer copying configurable","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"cdc542ef09be86f8946644c62fac9b93a4bcdab1","submitter":{"id":177,"url":"https://patchwork.libcamera.org/api/people/177/?format=json","name":"Milan Zamazal","email":"mzamazal@redhat.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23816/mbox/","series":[{"id":5287,"url":"https://patchwork.libcamera.org/api/series/5287/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5287","date":"2025-07-15T08:19:08","name":"Add global configuration file","version":14,"mbox":"https://patchwork.libcamera.org/series/5287/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23816/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23816/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 526D1C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 15 Jul 2025 08:20:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D2F9068F69;\n\tTue, 15 Jul 2025 10:20:07 +0200 (CEST)","from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6DEDA68F5D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 15 Jul 2025 10:19:50 +0200 (CEST)","from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-467-oetVOQmuMbGZCnZxYQscag-1;\n\tTue, 15 Jul 2025 04:19:47 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS id 12ABF180034E; Tue, 15 Jul 2025 08:19:46 +0000 (UTC)","from mzamazal-thinkpadp1gen7.tpbc.com (unknown [10.43.17.38])\n\tby mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 76F5C18002B1; Tue, 15 Jul 2025 08:19:44 +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=\"TOrHf70n\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1752567589;\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=vkxUbx+QDCvVHRE9hv/2widlkeeq6+n4CrZnMWdpOqk=;\n\tb=TOrHf70nAPEO5FAFCe/xwOktG++jjLzFgOMPUhMWYeZ74AqqQB1ISlmECFyLwTehL0cLsa\n\t/A5FWKB8711mdhC+JYjzxa9kgMjY8gdLgW8J2b1H9TBEHu2HtTeSNjVSZ/W3Lv2gqbNJ94\n\tQSMRbcFsSe+Dm3SBhm+njI3wQKKI8BA=","X-MC-Unique":"oetVOQmuMbGZCnZxYQscag-1","X-Mimecast-MFC-AGG-ID":"oetVOQmuMbGZCnZxYQscag_1752567586","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>","Subject":"[PATCH v14 09/12] libcamera: software_isp: Make input buffer copying\n\tconfigurable","Date":"Tue, 15 Jul 2025 10:19:16 +0200","Message-ID":"<20250715081921.5522-10-mzamazal@redhat.com>","In-Reply-To":"<20250715081921.5522-1-mzamazal@redhat.com>","References":"<20250715081921.5522-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":"UTlKZ_Q9mnx4HRs6Pz3VOdmO56VwgJTUl2xtygFgZjY_1752567586","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 it's 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\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n Documentation/runtime_configuration.rst     |  2 ++\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, 11 insertions(+), 15 deletions(-)","diff":"diff --git a/Documentation/runtime_configuration.rst b/Documentation/runtime_configuration.rst\nindex aaf158ef4..db8e27b03 100644\n--- a/Documentation/runtime_configuration.rst\n+++ b/Documentation/runtime_configuration.rst\n@@ -49,6 +49,7 @@ file structure:\n           pipeline_handler:\n             ...\n       simple:\n+        copy_input_buffer: # true/false\n         supported_devices:\n         - driver: # driver name, e.g. `mxc-isi`\n           software_isp: # true/false\n@@ -80,6 +81,7 @@ Configuration file example\n              min_unicam_buffers: 2\n              min_total_unicam_buffers: 2\n        simple:\n+         copy_input_buffer: false\n          supported_devices:\n          - driver: mxc-isi\n            software_isp: true\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..704d4e487 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>({ \"pipelines\", \"simple\", \"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":["v14","09/12"]}