From patchwork Thu Nov 27 02:22:48 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: 25230 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 5DE10C3260 for ; Thu, 27 Nov 2025 02:23:42 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EEC6A60AB8; Thu, 27 Nov 2025 03:23:41 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="clo4I6Y4"; dkim-atps=neutral Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3FA9460B0C for ; Thu, 27 Nov 2025 03:23:40 +0100 (CET) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-47796a837c7so1830055e9.0 for ; Wed, 26 Nov 2025 18:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1764210219; x=1764815019; 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=clo4I6Y4BDoxDZZmAxAHG7dYmVjnJm4pH0IrLGrM+jCHo676n/DKOC2COLF1tbf4JX ApfMDa/kvZkb3hIFvJzCmVNBLAgievdLF8dd+dTDfq6VSRma7sa8uPw+LD436ngfRF5Y rYB/dEg3y4mU2IG8f/hCjo2+kmglv/Ja2goL5UZI3RGzuhVgLji1QWuLyIqbgXct3f13 nVbhRAav1pq3/Y245VVAzgzd6RFTRmJWh91fqqsyfsQJN9JhpvBJBCeSfMBaQKjYjk80 uT3PdT3yx55e71lDNYwHyWra1rVK5T2K3wze8QG4Td25OaVKbfW1ZHjfCc0F5PoUFV+8 n33A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764210219; x=1764815019; 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=mC1OwVAkTtksOEEc82L9a5nQgTNB/Cii4ePzJwzZbUh18bRCJvUTJF9k9Hw019BMKf i1zz+6lfcUtTWlozIlB+kh2RNFZ+2Ul2Fm6yQbU3B5y8opNmRHuMvjCqOdqH3V7iHW2A BBrfISxsoMXyrS19XG2eQyoqZRd6VR2EOF3LMWPBgDvjIETKaarVHDId38dlw0bV2kqx u23kQ2+rHNFTXflckfCyu8fzT2ZJJ0q3F/UcVyQjzspou34d3Y5xYEliGUjFZhybe0s4 VOUePSdZ5LRD4xA0T+8ydqvhdWTA8wCeFYnvsQtyEcJa1c2BwiQBN9/KIbQdgZjwahjy jmpg== X-Gm-Message-State: AOJu0YwBk0Gr9bSLowiIsXHz+7tJZRJbGYj8bz9KnDmpKDcXb8n2Kgos CoS9xhBaa4uWwjAqeWXn8aI+GN82SG3ihItFEX88Dbhz7YIGkP74KwlrIZc6GJMntee8XUxwtvx JhhOssVM= X-Gm-Gg: ASbGncuelcbvqrF6Fb1Yhzc5O2UyzHsFOAcNtjpzCkrmtCO1pBdqLnnGcMUGzUXJtyg L2sZBFCD7uh8IX+jdDesGqNyQWbatNZMHGkP+flnk0PC+J/DpiSdPMeuy8xpYgzfm3HWvpY4eNd xLdjkhvPwfi3SfxE7NbC/e789/FkJInY0JLpux8rnCEoGRvm+FNE0eYCQdCp/HzHsI2fRc6/zVU wwD7M2UCB/baHlzl+CF2IlMiIL82ZEaDgWQ07L7WIxhAMOp31IQVRQRCB62+tyse3vojM4RWEYy K9/c1GQgYcjCtSfyveXzPRbCDX4aYYD2fC3FNeJv5Le0Lb+h9iJmZFJPxlpDQNh2dzlH1cyzVrU uKDfq9hHpgvFywd8CLFdFbP5jzc4gfSvtgG58WhJrIg33f/jsNooqq470MvAsmeX9834Il3eu51 A2dtz5SR+qRd1M41p+/82V+ONnFa6F54ziP4vMKh/r5qXLbdgqdlnPA6ojjr61RFyob6EOY2PDm o/ghQ== X-Google-Smtp-Source: AGHT+IFxfXemKPKV8Ky1eqwQJwLKv4dkS1/38hWFaF7bDg6K7T5lKkrdQ2CcB6p0trHJxmtManFyXg== X-Received: by 2002:a05:600c:3146:b0:477:df7:b020 with SMTP id 5b1f17b1804b1-477c01b2211mr216527785e9.18.1764210219597; Wed, 26 Nov 2025 18:23:39 -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-4790b0e21e8sm71549495e9.15.2025.11.26.18.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Nov 2025 18:23:38 -0800 (PST) From: Bryan O'Donoghue To: libcamera-devel@lists.libcamera.org Cc: pavel@ucw.cz, Bryan O'Donoghue Subject: [PATCH v2 16/22] libcamera: software_isp: Move configure to worker thread Date: Thu, 27 Nov 2025 02:22:48 +0000 Message-ID: <20251127022256.178929-17-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251127022256.178929-1-bryan.odonoghue@linaro.org> References: <20251127022256.178929-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 Reviewed-by: Kieran Bingham --- 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_); }