From patchwork Wed Dec 10 00:53:50 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: 25439 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 E8000C3257 for ; Wed, 10 Dec 2025 00:55:12 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A8DCC61487; Wed, 10 Dec 2025 01:55:12 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="RcFqvvSp"; dkim-atps=neutral Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0BC8C61487 for ; Wed, 10 Dec 2025 01:55:11 +0100 (CET) Received: by mail-pj1-x1029.google.com with SMTP id 98e67ed59e1d1-3436d6ca17bso6273638a91.3 for ; Tue, 09 Dec 2025 16:55:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1765328109; x=1765932909; 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=RpmNx23wwhxFY8b9M7YdWQZvEEvZGAvLIcRd8AlfRWg=; b=RcFqvvSphUuLI+9nj3PNidWT8QUS1Ks0f6NonLexZ6OfcxyvIOW+rJbmjwm66RdteE 4Wvd/OkntGxmp/+cGw7LbzF7L36E92PY9ptvf41O+mju3zyIlQsGVgaM+qJODL3++Ijc ibbr4sr4exMXGeZNzcdyAFaE1EUhjskofkSp+Sdj2+cAF1N1/h/lcGeEYN4lTRaQCM3o +FKH2E++crrILqnhBAsFc8HPlhLseuI3ZwdmHddI1up1BbO8bV41z/Av8B/VBzi62ZYr zNcKgGSqp4JtqkjxvC4mTJ4wNzvYXIS/4flqlKQmqmseZ2zjw10uZLlD3Qi7WjUY6zmF ZsVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765328109; x=1765932909; 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; bh=RpmNx23wwhxFY8b9M7YdWQZvEEvZGAvLIcRd8AlfRWg=; b=FM858SsaR+DqhRjqIDMbQLGepQdS/qipidV/dBA8p0eI0XShD9p9djCc5saf0mD99o 07zWudMUXlQ1H1aJ107ru5I+MByfPLyJol46ebt/C3wU3gUHBoj3Tp84XW8k0qSsot5S CdMDJM35x12FutZRIosWq2BQPbGcJBbSH+PUfzhzEe/sm5dlGVHMzaX0K9jYT22TMaPT NgYKUW8+B11XviFW4RGPzsHpjD5xQ6jp48s9eprJAnJ2FwxgDHc8/s6g08CnllXuldL/ Ekly2abJf8vYljIgN4dG0VDKdLl/VSjB488RpF3HR9OB8vsQ4qsbhSwnV3ghi+6mr/bB 5C9Q== X-Gm-Message-State: AOJu0Yyxkx/hVM03MPV/2WfSf/2ORasKmHzW0WGX3ZzTvz+KP134gpiN BS9YsoXH2+2Xp7Vhif8YhZ04haJJ3gRuJXexG6VMU1quEPEZUtv6+JZTjB33HQ5WkeaMZApkEZx SDgCN X-Gm-Gg: ASbGncsnyl6wVDPA2zpKJElp3osetQ5b0jjeRUpEWRelms0OOpFuFXnZBzU6MKa4zLy d6oVQI1ZTlt+AkKtFyxyDde3bzVHSJm21J8L8n9cIH2FfstC6AV8vPm1yrxtAUoUjldKEj8RwL8 rMJsqRpBdyBAC9QBogCt9Til8W42D1di/2gROQNu+zUYEsEotxMnIcmVdVV8w/jvA0ipl0UPkmf /I5e051Nw7/iMbuiyA9oehICxJyffAMQRu3cAX8LiBDj48pRleogjRHvn22rN9V9NCLG2bfwVKw hFZHXaN4q+Qvm85dGLNyT0UZa5Eg7g0gJVlI5ZPyL7Xn6LW77r4mFElTB+WPWjnOlnGVXhKZrcf J5JGv1KWtIjrNBn57Awyorvy0RjOu67R65F/4ml2qnxnu853VTIvv1Qn8ZKcKmTLwfQjUuckXFS kO9QP+k8Fb8akXBSa9iWJK3iy2rCc2DDuLaIB0eNNlMeooH7PC3paI7SMnppTCnN16 X-Google-Smtp-Source: AGHT+IHPhPo4ZaImxeWHezBdiLWw0Kg5zYqNxd7ZHFHXKZ0GQdkHTZ0XdZ1PRkD6scz28JTnAtxJ+g== X-Received: by 2002:a05:6a20:918c:b0:366:14ac:e1fa with SMTP id adf61e73a8af0-366e31b9cefmr595130637.76.1765328109363; Tue, 09 Dec 2025 16:55:09 -0800 (PST) Received: from inspiron14p-linux (p96936b06.osaknt01.ap.so-net.ne.jp. [150.147.107.6]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bf6875cc8eesm16057762a12.16.2025.12.09.16.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 16:55:09 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue , Milan Zamazal Subject: [PATCH v7 22/26] ipa: simple: Add a flag to indicate gpuIspEnabled Date: Wed, 10 Dec 2025 00:53:50 +0000 Message-ID: <20251210005354.44726-23-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251210005354.44726-1-bryan.odonoghue@linaro.org> References: <20251210005354.44726-1-bryan.odonoghue@linaro.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" Flag gpuIspEnabled in the simple IPA context. This flag will allow to selectively avoid some calculations or to generate a default CCM. Reviewed-by: Milan Zamazal Signed-off-by: Bryan O'Donoghue --- include/libcamera/ipa/soft.mojom | 3 ++- src/ipa/simple/ipa_context.h | 1 + src/ipa/simple/soft_simple.cpp | 3 +++ src/libcamera/software_isp/software_isp.cpp | 8 +++++++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom index 77328c5fd..aff8fcbd3 100644 --- a/include/libcamera/ipa/soft.mojom +++ b/include/libcamera/ipa/soft.mojom @@ -17,7 +17,8 @@ interface IPASoftInterface { libcamera.SharedFD fdStats, libcamera.SharedFD fdParams, libcamera.IPACameraSensorInfo sensorInfo, - libcamera.ControlInfoMap sensorControls) + libcamera.ControlInfoMap sensorControls, + bool gpuIspEnabled) => (int32 ret, libcamera.ControlInfoMap ipaControls, bool ccmEnabled); start() => (int32 ret); stop(); diff --git a/src/ipa/simple/ipa_context.h b/src/ipa/simple/ipa_context.h index 03d8007ea..20c75de4e 100644 --- a/src/ipa/simple/ipa_context.h +++ b/src/ipa/simple/ipa_context.h @@ -104,6 +104,7 @@ struct IPAContext { ControlInfoMap::Map ctrlMap; bool ccmEnabled = false; bool selfInitialising = false; + bool gpuIspEnabled = false; }; } /* namespace ipa::soft */ diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp index b147aca2e..2bbe271d9 100644 --- a/src/ipa/simple/soft_simple.cpp +++ b/src/ipa/simple/soft_simple.cpp @@ -55,6 +55,7 @@ public: const SharedFD &fdParams, const IPACameraSensorInfo &sensorInfo, const ControlInfoMap &sensorControls, + bool gpuIspEnabled, ControlInfoMap *ipaControls, bool *ccmEnabled) override; int configure(const IPAConfigInfo &configInfo) override; @@ -95,6 +96,7 @@ int IPASoftSimple::init(const IPASettings &settings, const SharedFD &fdParams, const IPACameraSensorInfo &sensorInfo, const ControlInfoMap &sensorControls, + bool gpuIspEnabled, ControlInfoMap *ipaControls, bool *ccmEnabled) { @@ -106,6 +108,7 @@ int IPASoftSimple::init(const IPASettings &settings, } context_.sensorInfo = sensorInfo; + context_.gpuIspEnabled = gpuIspEnabled; /* Load the tuning data file */ File file(settings.configurationFile); diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index 06f93ee0f..1aa4357ad 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -121,6 +121,8 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, } stats->statsReady.connect(this, &SoftwareIsp::statsReady); + bool gpuIspEnabled; + #if HAVE_DEBAYER_EGL std::optional softISPMode = configuration.envOption("LIBCAMERA_SOFTISP_MODE", { "software_isp", "mode" }); if (softISPMode) { @@ -137,10 +139,13 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, LOG(SoftwareIsp, Error) << "Failed to instantiate GPUISP"; return; } + gpuIspEnabled = true; } #endif - if (!debayer_) + if (!debayer_) { debayer_ = std::make_unique(std::move(stats), configuration); + gpuIspEnabled = false; + } if (!debayer_) { LOG(SoftwareIsp, Error) << "Failed to create Debayer object"; @@ -177,6 +182,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, sharedParams_.fd(), sensorInfo, sensor->controls(), + gpuIspEnabled, ipaControls, &ccmEnabled_); if (ret) {