From patchwork Thu Nov 20 23:20:13 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: 25117 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 A75B5C3330 for ; Thu, 20 Nov 2025 23:20:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 5EEEF60B0B; Fri, 21 Nov 2025 00:20:55 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="All0US39"; dkim-atps=neutral Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9F2AF60AAF for ; Fri, 21 Nov 2025 00:20:52 +0100 (CET) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-47774d3536dso11138655e9.0 for ; Thu, 20 Nov 2025 15:20:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1763680852; x=1764285652; 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=KaV04Bxgis4mNG/lyi1+ASdW7XQgEYuf59tHgnfd3u4=; b=All0US39BUpkpZs6opGdVRIsxLi0vSw6oSewAkfCtUXONY/y1pWZcCltRayZSUoF1f aE7O9XQclAboAd+EKDOqWEoTBBSNwebQOmZIwAaOy+MJObViG30dZUMPXRGqzv3tASYF y6JXoWoQVSFG1mNO08b4XjrQEKvCQSIcHqnZjY4letnTTSFM2bjVyY7tCSdvbqq/JJ0X jt/H/qtJtXk2p6gCkbqwmncltCGff+zv66APUq06Dt7sEL7Ci/busaZJ9w8R4J1Rmtn5 pbG/6jWGtbre05t8VqYs2jm1kZSix/0iUhF0MModHeCE7k5w1QlBhnDEoCP8SONcQr7v Yz2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763680852; x=1764285652; 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=KaV04Bxgis4mNG/lyi1+ASdW7XQgEYuf59tHgnfd3u4=; b=WN2saLwOkzCxv4quJhYwC4oJUg5Eo0SVOWQNKHbUOcoW1WQnelHoaqadMtccleTFm/ jAj5KtBttSn44wPCTNINJlFN82eDNic2yyxkCzoRnaEl6ySPIP52JElzVjAXDDtXmYLN Txnxd7wOtvqHQ66ukD3/zZ1pbLvIRe8a7bFmH+3In4nP929Zr0du7KCj8JhaYTVREOFL g9nyFhGYpM2dWJjh0c+qqIJWKIkZypucYOdf3kh4Kw9o8H0AiLoALu6gaLU6H5FQt77y ELv4wG6hlSxyAQub9oAdsUm2HP7q8di3YXm7aHuDWtm2FfT0gK1V+pf66eODEXkzyZqh JM/Q== X-Gm-Message-State: AOJu0YxcbVcGXe8iqHOVU8pQvRJui0h5XxEC1MIPXcDyfz9ZSvMelwzw VeT/zuHmoYJHH83F22vUJt37V+rPbgU9ogrXljPtV8kxC7qKch/luGZIWXMAUK1RcCF5zLFoLyU lctzyidw= X-Gm-Gg: ASbGncsw8mjtSws3TRH9W6waSefDWHEsX2Ar31WbJdnikflw/vd08sRuslzf9oWO9N8 CqSOB1BFdZtC9WECPSQkX+gJXEEOFjlKoZwRZFIxb2KdzoxU1U+bZh/zIwNz6CTzyLitGS1ssiJ t70J7XcDRLjGFc7250aunPxAWVqjYGPwdhq39EBYi7M2wqv3WofTHiFEmC2uIi0dnMx0XnyppU6 3FGBmHFViqQBjzxUM3/6eZ9HkG29qi8fAaM5doyH0Jh1hWC+IR4aPKUNZFJwNlNGB97/D31bYHR C6Q+MO1BRJDI8pgBoKwqrO+J7zN25zxZj/SGWYprA6rC4GR+qKCgraMBDpsEtGtuWO5mY9qfYpe L8YCmmpwWRUuoFbmsN7B8jGiKG4fAcGIujDzFIu9FVL4n2vNnHA2qXsAirGucCoYCcxDhQxJ4ED W7fkID4ARFU/ZtfrlxGGTsrKFdYXXHVQJPNH7PioIW1A16cCLLW9M0oqmww3p+486vET4= X-Google-Smtp-Source: AGHT+IHhGmh/RDHP45IYLyYaVUdsVYtEgSZ/RPgEH+7rVDtYp+oOSej4EvudkQel7oELsNrNykR7Og== X-Received: by 2002:a05:600c:4685:b0:475:ddad:c3a9 with SMTP id 5b1f17b1804b1-477c052f04bmr2490385e9.13.1763680851947; Thu, 20 Nov 2025 15:20:51 -0800 (PST) Received: from inspiron14p-linux.ht.home (188-141-3-146.dynamic.upc.ie. [188.141.3.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-477bf3af0ecsm11618415e9.9.2025.11.20.15.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 15:20:51 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue Subject: [PATCH 16/22] libcamera: software_isp: Move configure to worker thread Date: Thu, 20 Nov 2025 23:20:13 +0000 Message-ID: <20251120232019.3590-17-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251120232019.3590-1-bryan.odonoghue@linaro.org> References: <20251120232019.3590-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" EGL requires both configure() and process() to operate on the same thread. As preparation for that, move current CPU configure into the WorkerThread with a ConnectionTypeBlocking invocation of &DebayerCpu::configure. Signed-off-by: Bryan O'Donoghue --- src/libcamera/software_isp/software_isp.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index afa4eb7a8..4c232339b 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -267,7 +267,15 @@ int SoftwareIsp::configure(const StreamConfiguration &inputCfg, ispWorkerThread_.start(); - return debayer_->configure(inputCfg, outputCfgs, ccmEnabled_); + ret = debayer_->invokeMethod(&Debayer::configure, + ConnectionTypeBlocking, inputCfg, + outputCfgs, ccmEnabled_); + if (ret) { + ispWorkerThread_.exit(); + ispWorkerThread_.wait(); + } + + return ret; } /** @@ -391,7 +399,7 @@ void SoftwareIsp::stop() void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output) { ipa_->computeParams(frame); - debayer_->invokeMethod(&DebayerCpu::process, + debayer_->invokeMethod(&Debayer::process, ConnectionTypeQueued, frame, input, output, debayerParams_); }