From patchwork Mon Oct 20 12:24:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Bouyer X-Patchwork-Id: 24706 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 C38C8C32CE for ; Mon, 20 Oct 2025 12:22:19 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2FA146072D; Mon, 20 Oct 2025 14:22:18 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Jfcaqz/b"; dkim-atps=neutral Received: from AM0PR02CU008.outbound.protection.outlook.com (mail-westeuropeazlp170130006.outbound.protection.outlook.com [IPv6:2a01:111:f403:c201::6]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 70E4860713 for ; Mon, 20 Oct 2025 14:22:15 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=b/ugWPyrggG2beCh8LtjwZps5iIm1wvuY52zD+7W4DflIce20jKkMtkj4vFhOmc+YG2k5nJCSQ02KTyn5qBc5z1Id2kr+Tvdv1vExCAoITAqil+Zqrci8CLfrJECIXFmJ4lkPMQRjo/LqXpi5q7JITuJ0O6myfATwl5OgqSALbnPSYd0r3doI+EFzK2qDP4K/f661IOEwIBhucAWSR/CzlIE8FXZb3zJ9TDM+8RC/VnNmHKlUgZQMmUDiwOnjb/duK6fK2uTnASW4hQ3/pXULPpvlIX3KkULc5pgZ7kerg3y4pYq1WnJDXFyebmnPuhGaHB1dSBNgCxphFqio3DRXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=W+URT+wVICAx/mukpkznPd/qtgQBE+RsBCVunbmRgiQ=; b=HfI++uYBtbOyISXqiQk6hTpeQMf96UImjud3TaEs4DFf8MMdN3lPpwOV0JKuYaMNWdbBWS/rI2tATeJjM80qjtTgfpISORhp+PQk1oxYgzx34RJqXTf/+C7KhruF+M1TGfuEKMak6fzMCkBPJRP9vzXiS5sn+OVkJpa2XInaMMfrwsysXCFlU7AJmRru8STVsS7FWp+Lw+WWzt5fi6ScrhCcbaZcJx050R9XNpOJgm6Qm+o9oxFSN1I6JESrkoWjf+jegxqSjXtZUssgnevEsCLeUlEMXrQEgdOnNilGIa0AXbuVLFuYx3FKl9XyXUppoK9uH7pMeo2jsm8t10d6pQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W+URT+wVICAx/mukpkznPd/qtgQBE+RsBCVunbmRgiQ=; b=Jfcaqz/bYPyWKpvMUkcfKEBp4VpcALXhc5cP3BcOCTc38ciIboZ76HDpYVd3HfDd8xEFsGBcX9atPhO6RGkC21H6rSBsadVOMt2V+t7lo/avoQxcLZBYamp2O40AAzTWSF4dGmxA34FcMUp727sT+3Zg3BSySKjf5HJPzyQq0RsF3KzCP074np8YOvPirCS9h5AdruifyecHqCAOX4s3MLNnThtGNSRabX4l66/BqzAoTVRdPbsqzXLTiL037pJtCx3RfXDcmJ5EpMaUc9BPEs5brPPhSNFhpJ4NEFMA7uHVp2K9o6LVLn2HtLfpymc5iXxCRXqqArE9QLLZeI7RwQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from GVXPR04MB9831.eurprd04.prod.outlook.com (2603:10a6:150:11c::8) by VI0PR04MB11546.eurprd04.prod.outlook.com (2603:10a6:800:301::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9228.14; Mon, 20 Oct 2025 12:22:14 +0000 Received: from GVXPR04MB9831.eurprd04.prod.outlook.com ([fe80::4634:3d9c:c4a:641a]) by GVXPR04MB9831.eurprd04.prod.outlook.com ([fe80::4634:3d9c:c4a:641a%6]) with mapi id 15.20.9228.015; Mon, 20 Oct 2025 12:22:14 +0000 From: Antoine Bouyer To: libcamera-devel@lists.libcamera.org Cc: julien.vuillaumier@nxp.com, Andrei Gansari , Antoine Bouyer Subject: [PATCH v1 1/1] pipeline: imx8-isi: Delay ISI routes config to acquire() time Date: Mon, 20 Oct 2025 14:24:00 +0200 Message-Id: <20251020122400.1759110-2-antoine.bouyer@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20251020122400.1759110-1-antoine.bouyer@nxp.com> References: <20251020122400.1759110-1-antoine.bouyer@nxp.com> X-ClientProxiedBy: AM0PR02CA0215.eurprd02.prod.outlook.com (2603:10a6:20b:28f::22) To GVXPR04MB9831.eurprd04.prod.outlook.com (2603:10a6:150:11c::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GVXPR04MB9831:EE_|VI0PR04MB11546:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ed84d07-b55c-476c-02ea-08de0fd34d12 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|52116014|1800799024|376014|366016|19092799006|38350700014; X-Microsoft-Antispam-Message-Info: haPDVd7ZWLsVT0znBeT66TRj9zRjhmsNE4fRcEZFXv/5iqfLSCWqk5lfK98zewSBkt0pyOXk4csOJLY59cRC6Sb9xfHq8Q4MMMpKddh6228j+k3UFDYKfNvjvL8wvA1VzFGXWEmF3jUQPuHDZ7YQLcUwlBi6R5zBRyei+95i20v1ygnfpn6dYcmwGEYHLVuVjMud56cvlUcDd8S06js6p8hKpham5jSWti77sfFi9DFcH0OMbWfO47vuxrmo4PuoR9tuQ6M8sXjfhEjp1aZ4fXws4J0SPo162h+nQ4UAait0W5Wl4jpEs2ZADOM3axWd0lT19hdlDkzBT/fUxejDCGsAA4xCKaqmNI0a0YvOe71PtUFw7b0hBP69hbX2E8KcXelcgF/joL/pi97dLnvJCTfMMum0H/1cRmG1uhPEQwtCBP1XCmoxWri8SjM/PDKkeqgQ2pOFJfd+zGD8utgUjBcH+xPJTpQwZgwNyklgD6N91UI9ty4qpGVLSUGDVh0kpbPuI7igOQDuKDk83oQe5/r/YTfUTeAnIJayJiF9PIIBnOg09wnUunust3rrk+yFUQ9HZEpZf92Sz8VI50TnyAC7wLvmXPuNkhPk9Xe+wAFpnbDmjAMyWg9zlMfmd+S22SFf8rLnsrPjcWFs/26Z/Nd/m/Xsny+j70ocPHZ2u6weFvss2qUz6UDaGMhmDYlRqWB2Izn1XPp8JIGYCCQUP2t+RTDyjgk5KSruCS+n7y2iHLfTBsGNS5OKsGil/igk5wqoXavTsVkVKBs2owhFung/bEukaB2rMb+0EAGR5TwD7KiJ8AiJcHyttaaD5LPWzyCdjmqUCOHyXMFfXkW8u4zkHfhp1UQKMv3Tzng0kxvE7l7xSN/vpo2jbbx32/WRlBGHvO5J+k4HgtxoVKVy0oVpJi9WrOJbvLCq1XqrzNKD6uOjzE/gUOi+8rQ7ksY+kkWcixKWanFlLiesq9809dlD/VgCddeuPsQo1BWpl7lNgWQ4f/nPWh3Y12mqOpyLIO1D4C+E6iq3RIwj3qT4qhF3qKXPl7Gtjne2KAWOVdLRtYws3aEPWeXJx5WOuGSvAWFgxEubxyxLiiDdc2JgmkTroTrDiqcpWkRiDuaOGNkf24A8WSBZQd/A0hbIqJpcpAF787ww3gNHDW9ND5VAdBC9OalFxRJFot3KUfl6tIhpWPNJ48/5AWrnzjv/0y7PfKFhu58VOyunL8I59s7gzMrV5fYxhWUgo+vWYxo85C3wTDjgZJ2YJAmizBunml32M+Rvi+QTzClWzEFO7Fwa11JWrlng6D/TnpeCfkYwClm76mOkzIbgYjLwEA3qAPoffIdE0oeI89RL2GINrvgq2MQAQhfOkyYj2J3TSY5HdZCzHhuHEpim+ES+Mf91Np1ebic0z1HQa6cRzcMmNTFmuzKaM+lRpzRLUglOFJIpNbNSGPCPeHobDeletiGKO1H6wXA8hRU8brhXmkakxJCUDw73+0MDbA9xnjEJ0nB/kTk5TRzuC/aghXSRFWgw+qCl X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:GVXPR04MB9831.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(52116014)(1800799024)(376014)(366016)(19092799006)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8UaCgToFp3Av+VSz5T0FGAY3LQVR5AbLOy6KJOsJuj7V4HzjiZ/tOKhhDocvns0BahsnzP7xa7J78AEaTK4HfxYOtrVg+UPxdsyCTAx5zW1ELdz34/BHUr2AVePAmEZtglwvylLmuVYcpxlm7ods7a0GbP+LEgofS8zi+IOmE1DTxzFPJy4Eo7GK9jP8xktWTbR7HCyLb0LdfrTWCNryTW4GHDgoC0c+QJpnQuprCWUgFGuSujbKbiFC+NgDBNWn/g8lZhG1QAVUHl4uM7Tg3UbgiCDKW5naeTUe5pkwsCOVDNLJajPjcYyu7/Sov2SN7wolbWd7S/R6uX+ORxFdL3xezE3RLdQdxHKjof8+iLu3Paswj0cRxzFXX8dDW9mHnwfIjL4/6p3FiRSf5ilcy05/UvE9tdtbeI1KaJIWRbF3hB/zkyjMrE1O0j72SAVxc7Lrj+IXFbVpRsw2Sit1RktpisTmvgWDAJg4IZ+YL0nrI+5G71SLiWgE9eByHjWfIqZb8rfO288ffGAxt3IMaP3J01dnBxr1lvGhAS+yHKF8xxRLBdyeJXK8Nz8uF8Q2Y82SDuPYxI0cKjlDQOeXiinKs/wpotIyUXDefRDNSPhOV/5J3D6sM6ziaESKwQZFo3uy5G4iyu7UIp/5o4LUDwaVxlL26unF7ItRzdO2IztC+H4YK8nfpf7rcfTMsEk2Qeohg5yvks2Ndrfu4UCAnvbu86h/41CsHEgqAJGys7faBTxkgKpafrXbKhfrjS6p+AXXYCEwFEeK7bcqrieActyrRzPP/Uulds+O2VixYd3RhnpXksCOJFhA3J3LuqClSG/g3Cbw4JrTzV4U4u7K+YK/HZfoTb/GJXBjbWhbOTGSmR3eMpvlxSVwF0InQ0D3w6FaC2LmjwjRy7qdOECpEzQhd/EoYsHdxVZxlc1TzheMslwntWScziz6VZv75DS73Tx6Cae4ZX29FoeWiBcXfEKWXoofhWeJd0UQ8Wzbe160kjlHz2j8GJcYguXW3nwEN1szv2g7XIgN72jAC3oZqOcZvye1ffZxtVlOHle+ufoGLIbJfY9c5iCye7aotc9yUKZ2ZVOynexpt3c1PoYTHmiedlUVrqkRra99BzPuEyxXrJ0+1Iub1cg3qQp3mMTPIHYYcsu/QuoeQFGNpJnS5a8dmX6uGyJxh+rPWrN9Q1ZynGM5ubT8aNnbETu/mNlTKwCpHCFIj7zU51BGJmm0/zTdhmwSc+h3zRb0h1tf8NRZn8k2hIogjR94qVizaduHgmOzlDftOLrAKLtzlhYMRt11fjGWxyZuO6NcwYhO9PhSylkxpK+PRn2C75VmYNBnmJz+Y6X0OL0Ru7ov1EnRcJZ3Z/p0o+YltxI9T6eSGEWTtD0p9HxYVdGduuUKYo2vz8Qq+/IDsISK1RFa0cGumQZjbjf1GTsb5LjFvUdGG/hIHUlykqjbdGrSAoxwmD1s6291OxMRir1ldwk1160yglWlEDfYPur+jCzdPCwTiewRlUQT+2dYa489y1NbbLlCxcdwOpQAu4q1A6lGuM0CI7qUPOEY7TxK5EMKy4g3JdJMn4yfqImTIyLUdL57Mj0P/hbfWaK0iEGxe5JCNyaTgg== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8ed84d07-b55c-476c-02ea-08de0fd34d12 X-MS-Exchange-CrossTenant-AuthSource: GVXPR04MB9831.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2025 12:22:14.0742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /EhVN8L286JQx2G0saS9YxMhIIVSkQ7dlSY0WWwqiIO3RLE93+bGDBppXqLipoql1VuiNMuOVQfkdr4sqNNQSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI0PR04MB11546 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" From: Andrei Gansari Fixes behavior when calling 'cam -l' during a live stream from a camera in another process. Issue is that multiple process should be able to list (match procedure) the camera supported. But only the unique process that lock the media devices in order to be able to configure then start the pipeline should setup the routes, graphs etc. Thus, the setRouting() is to be moved to a PipelineHandlerISI::acquireDevice() implementation to override the default Pipeline::acquireDevice() function. Fixes: 92df79112fb2 ("pipeline: imx8-isi: Add multicamera support") Signed-off-by: Andrei Gansari Tested-by: Antoine Bouyer --- src/libcamera/pipeline/imx8-isi/imx8-isi.cpp | 46 +++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp index de09431cb9b9..26f556bbb819 100644 --- a/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp +++ b/src/libcamera/pipeline/imx8-isi/imx8-isi.cpp @@ -71,6 +71,8 @@ public: unsigned int xbarSink_ = 0; unsigned int xbarSourceOffset_ = 0; + + const std::string &cameraName() const { return sensor_->entity()->name(); } }; class ISICameraConfiguration : public CameraConfiguration @@ -117,6 +119,9 @@ protected: int queueRequestDevice(Camera *camera, Request *request) override; + bool acquireDevice(Camera *camera) override; + void releaseDevice(Camera *camera) override; + private: static constexpr Size kPreviewSize = { 1920, 1080 }; static constexpr Size kMinISISize = { 1, 1 }; @@ -143,6 +148,10 @@ private: std::unique_ptr crossbar_; std::vector pipes_; + + unsigned int acquireCount_ = 0; + + V4L2Subdevice::Routing routing_ = {}; }; /* ----------------------------------------------------------------------------- @@ -950,6 +959,36 @@ int PipelineHandlerISI::queueRequestDevice(Camera *camera, Request *request) return 0; } +bool PipelineHandlerISI::acquireDevice(Camera *camera) +{ + ISICameraData *data = cameraData(camera); + int ret; + + acquireCount_++; + LOG(ISI, Debug) << "acquireDevice " << data->cameraName() + << " count " << acquireCount_; + + if (acquireCount_ > 1) + return true; + + /* Enable routing for all available sensors once */ + ret = crossbar_->setRouting(&routing_, V4L2Subdevice::ActiveFormat); + if (ret) + return ret; + + return true; +} + +void PipelineHandlerISI::releaseDevice(Camera *camera) +{ + ISICameraData *data = cameraData(camera); + + ASSERT(acquireCount_); + acquireCount_--; + LOG(ISI, Debug) << "releaseDevice " << data->cameraName() + << " count " << acquireCount_; +} + bool PipelineHandlerISI::match(DeviceEnumerator *enumerator) { DeviceMatch dm("mxc-isi"); @@ -1034,7 +1073,6 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator) unsigned int numSinks = 0; const unsigned int xbarFirstSource = crossbar_->entity()->pads().size() - pipes_.size(); const unsigned int maxStreams = pipes_.size() / cameraCount; - V4L2Subdevice::Routing routing = {}; for (MediaPad *pad : crossbar_->entity()->pads()) { unsigned int sink = numSinks; @@ -1104,7 +1142,7 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator) /* Add routes to the crossbar switch routing table. */ for (unsigned i = 0; i < data->streams_.size(); i++) { unsigned int sourcePad = xbarFirstSource + data->xbarSourceOffset_ + i; - routing.emplace_back(V4L2Subdevice::Stream{ data->xbarSink_, 0 }, + routing_.emplace_back(V4L2Subdevice::Stream{ data->xbarSink_, 0 }, V4L2Subdevice::Stream{ sourcePad, 0 }, V4L2_SUBDEV_ROUTE_FL_ACTIVE); } @@ -1116,10 +1154,6 @@ bool PipelineHandlerISI::match(DeviceEnumerator *enumerator) numCameras++; } - ret = crossbar_->setRouting(&routing, V4L2Subdevice::ActiveFormat); - if (ret) - return false; - return numCameras > 0; }