From patchwork Tue May 12 17:53:38 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 26744 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 59565BDB1C for ; Tue, 12 May 2026 17:53:54 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0B7FB63030; Tue, 12 May 2026 19:53:54 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="CTV+kVZW"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="hpdBGSWZ"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 10A7A6302B for ; Tue, 12 May 2026 19:53:50 +0200 (CEST) Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64CC4TdW3320988 for ; Tue, 12 May 2026 17:53:49 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= MVhSLAevAIMMhWm3lhl373TWZa4csmk+fZHG60DydbA=; b=CTV+kVZWXDFnAWvU 2Y9FesEXwl7Z/6y/Ald1sdnqE0QX8MvmEXYNmPdeJOxq54prCyTpfU1pVoO3ZmPA Kk6NckKPcXGSkysybD/3DF8FNfe7rE6/b4GXyGcwUC1FVaT4d3LYB/vDMskRapcb iYungUme89AYmyyLCKNs5/ljOY2mSWWZLs6h5+gfJfQiHYkSp9y4zlq8LxqOOSh4 tJilIIC3fcgDCXUrC1AUlHQpaKUZ+QcSRlWwJMgaeLWQj0BaDq408OVE5wZLupxv g55kuebAbcZdZ9EByCPXsfE5TzRDqvF4DbLmdjDBDY+Pc4opwTZlpJaVARgJFDwU i7ILYw== Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e43w1sbv6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 12 May 2026 17:53:48 +0000 (GMT) Received: by mail-ua1-f71.google.com with SMTP id a1e0cc1a2514c-95cf2f6a8d6so9962244241.1 for ; Tue, 12 May 2026 10:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778608427; x=1779213227; 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=MVhSLAevAIMMhWm3lhl373TWZa4csmk+fZHG60DydbA=; b=hpdBGSWZLYFaW69YKVh8uGmKDMtzNvCg89hacK4JmxGBYI3DYaWUyNtQ1LaBx5xNE9 OOoncu6HS28PIt5R+1BdUflRuqzoizCEK36WElgPiJO8QBm806nDfoJriYu6EEVgIHEZ 9rrT/NEl/U71HcnOfGTeu0NbLvQAJl6WYndIJjqRDq6VzTKwp3w3iRwySV83/kPt95jk 3MJlr2J2uzdFgmtP/P+tbtA5kvYGHxsVpocdQnIf38m73PBZSrsuTrAg82w0zLQkBlno r7PpR1a4cTuddn+yjI7zSboWq9ig6Ps5J3C74Af+2tY1HPx5OXacZ8zLvijtOnY8wv5Z XqYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778608427; x=1779213227; 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=MVhSLAevAIMMhWm3lhl373TWZa4csmk+fZHG60DydbA=; b=ONlJoszk5Cyr6fqKYSZHnfd1jNER/qacwCyqnGSFAxS3/CceR8UIlhQm1U7A9pywRj mXLuo5ui9P6v+VVi9UPCFq5oAmYB1+KxSnInuUgZEwMK7P4ImF0j9LbKK2r1C5yZyhII eQY1TOyS8RJ9LJOK8lP1ZUIB+eBnIDDi08JdNDDFOFwfUfuymf2WqTxLj9FMW46b3GC0 jaSw45fEGpRSObXYGcSRxH7MP4lmlWzOHR6gBaf+vXbprDaeu78RI+BmNm0Dk8mJZPEa WUxqyjXimxPQHyoL24uOo8gLxW3KGCmAOhIHj68coVsK0ChHBpEEOWqh6IKust5NCStx nQxg== X-Gm-Message-State: AOJu0YyMX3wMmvDvkyEPD6qqqzdmij0Me5ObKbLlKegZtmySqG5Gu34A Hov5SlUoNoz4mlUa4JwIco6WRxnKuWp1OWz9TL8FuY36Ah8saYSEwiPtU0h7kH4WviK8YRIpqJx GM20cakupS6MrY52/lTMvwLrYYzkuDKvIDXAlC94syrWZz/W4M9EyjmjN4w3M9yp2hy5PfsTB4m Yax6WW4zwo X-Gm-Gg: Acq92OGWFvO40M/BgGjWaxSl3TCL4l8k5vhV/kEdyffpFGHKyL8+DYvTqsDwvQbXGoQ qSK0rBmaxLn2B/A2moIl7YdZ71eZ/sNPq64hH/TKN+iDtM9ct2tDv3LF5qMm3twyvEqVUif9CKi 8lSYIyUSF8UrBfuGV5t3lTM8gwT7NfsB6keDgeRUDVLJ/f74LZ6DT/MWbGC6XpnrO5GMEhJT2a0 hz4mcaJbCQWlQN2rdKAgLCKRJl0ntq+N6rY4Ty3HgdHZTezP3B+YEc2tKyiHn/rU+W4gOnJpOa8 8e6SXjoXdUu54FBPngCThSd5jvkNoKQPVk8/m0EUrfQs1lnBVY/5vce0yz78BxRwpaI5Sx0tAGW K6KLVduRj1lC/j5DMciZV/8Ue1HWEhAOaduYcoi1uipnaHvGZBkn8tg7zbeRSX0RAOrPc8lCRbK F6t5QvhmvCH4f+Ri7lw6L5IuxwFk+tNq8JKHvd X-Received: by 2002:a05:6102:5e91:b0:600:3b3e:681a with SMTP id ada2fe7eead31-635d14761e2mr2039702137.14.1778608427417; Tue, 12 May 2026 10:53:47 -0700 (PDT) X-Received: by 2002:a05:6102:5e91:b0:600:3b3e:681a with SMTP id ada2fe7eead31-635d14761e2mr2039693137.14.1778608426964; Tue, 12 May 2026 10:53:46 -0700 (PDT) Received: from shalem (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-bce128529fbsm463191566b.36.2026.05.12.10.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 10:53:45 -0700 (PDT) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Cc: Hans de Goede , Jacopo Mondi , =?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= , Kieran Bingham Subject: [PATCH v5 2/4] ipa: ipa_module: Remove pipelineName Date: Tue, 12 May 2026 19:53:38 +0200 Message-ID: <20260512175340.115153-3-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512175340.115153-1-johannes.goede@oss.qualcomm.com> References: <20260512175340.115153-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: U0-Chs6DPvcUUroTybki79JH6dqgJaJE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTEyMDE4NSBTYWx0ZWRfX8dHxfpcFuNF+ 1gdzIlqe9fd1oiWLFAVIQVrsxGakDilBjKXOzyLEQxGKoOlyfeCoojVop4pnr3NHztnWYoUQw7w UXHNAWpC8QkqBesMmPlv3JvjdVmZpRmlI67EH1pDdTOB7A0pxR3fU44WfwG+w2+yPstqqC53+Nl ABcUfVMKfZ2oeVCH5NJpe4L/Vkiqe2v0ZkPLUu6ZgH3cVk6h5V7/tNQyvqZ1fpqI/eUKAm+hGBF sxoY5nio600ivpSQ3svB1Ca3zYZIS4wSz5Q3a+BOtG9zvzzLdyx1gNd0BqLRcXU7jIvPq1uMx5s 1pqS/aGnujuocnXUp6Y1BTbVKP8kox0Dyqa/kJRG9B2VIBWLpO30hQdev9uTA0838qGUKTLuoKL teh599MMRO/DRpqYztzNasZCh+8NkVXbaGTfgymVGqeVe0FgWalsqIUUw3m7P592B7S0ZjuXJWu XoSVkvLfVPKQ3+gDgvA== X-Proofpoint-ORIG-GUID: U0-Chs6DPvcUUroTybki79JH6dqgJaJE X-Authority-Analysis: v=2.4 cv=BoGtB4X5 c=1 sm=1 tr=0 ts=6a03692c cx=c_pps a=KB4UBwrhAZV1kjiGHFQexw==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=YMgV9FUhrdKAYTUUvYB2:22 a=P1BnusSwAAAA:8 a=EUspDBNiAAAA:8 a=lvZftHTMWe99GEGio_gA:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=o1xkdb1NAhiiM49bd1HK:22 a=D0XLA9XvdZm18NrgonBM:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1143, Hydra:6.1.51, FMLib:17.12.100.49 definitions=2026-05-11_05,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 bulkscore=0 adultscore=0 clxscore=1015 impostorscore=0 phishscore=0 spamscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605120185 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: Jacopo Mondi All the IPA modules declare a pipelineName that is identical to their name. As we now support creating IPAs by name (either explicitly provided by the pipeline handlers or by using the pipeline name), the duplicated information in IPAModuleInfo is redundant. Remove it. Signed-off-by: Jacopo Mondi Reviewed-by: Barnabás Pőcze Reviewed-by: Kieran Bingham Reviewed-by: Hans de Goede Signed-off-by: Hans de Goede --- include/libcamera/ipa/ipa_module_info.h | 1 - src/ipa/ipu3/ipu3.cpp | 1 - src/ipa/mali-c55/mali-c55.cpp | 1 - src/ipa/rkisp1/rkisp1.cpp | 1 - src/ipa/rpi/pisp/pisp.cpp | 1 - src/ipa/rpi/vc4/vc4.cpp | 1 - src/ipa/simple/soft_simple.cpp | 1 - src/ipa/vimc/vimc.cpp | 1 - src/libcamera/ipa_module.cpp | 15 ++++++--------- test/ipa/ipa_module_test.cpp | 3 --- 10 files changed, 6 insertions(+), 20 deletions(-) diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h index 3507a6d76..436ec82d7 100644 --- a/include/libcamera/ipa/ipa_module_info.h +++ b/include/libcamera/ipa/ipa_module_info.h @@ -16,7 +16,6 @@ namespace libcamera { struct IPAModuleInfo { int moduleAPIVersion; uint32_t pipelineVersion; - char pipelineName[256]; char name[256]; } __attribute__((packed)); diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 4bdc4b767..42d475ecc 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -672,7 +672,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "ipu3", - "ipu3", }; /** diff --git a/src/ipa/mali-c55/mali-c55.cpp b/src/ipa/mali-c55/mali-c55.cpp index 1d3af0627..47bcd3748 100644 --- a/src/ipa/mali-c55/mali-c55.cpp +++ b/src/ipa/mali-c55/mali-c55.cpp @@ -380,7 +380,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "mali-c55", - "mali-c55", }; IPAInterface *ipaCreate() diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 58ef163d8..e0dde542c 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -481,7 +481,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "rkisp1", - "rkisp1", }; IPAInterface *ipaCreate() diff --git a/src/ipa/rpi/pisp/pisp.cpp b/src/ipa/rpi/pisp/pisp.cpp index de2a6afeb..975d8bfdf 100644 --- a/src/ipa/rpi/pisp/pisp.cpp +++ b/src/ipa/rpi/pisp/pisp.cpp @@ -1145,7 +1145,6 @@ const IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "rpi/pisp", - "rpi/pisp", }; IPAInterface *ipaCreate() diff --git a/src/ipa/rpi/vc4/vc4.cpp b/src/ipa/rpi/vc4/vc4.cpp index b6ca44e7a..f30eee7ff 100644 --- a/src/ipa/rpi/vc4/vc4.cpp +++ b/src/ipa/rpi/vc4/vc4.cpp @@ -633,7 +633,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 1, "rpi/vc4", - "rpi/vc4", }; IPAInterface *ipaCreate() diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp index 629e1a32d..d4ab91e30 100644 --- a/src/ipa/simple/soft_simple.cpp +++ b/src/ipa/simple/soft_simple.cpp @@ -343,7 +343,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 0, "simple", - "simple", }; IPAInterface *ipaCreate() diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 4162b848f..bae48ea90 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -183,7 +183,6 @@ const struct IPAModuleInfo ipaModuleInfo = { IPA_MODULE_API_VERSION, 0, "vimc", - "vimc", }; IPAInterface *ipaCreate() diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index c89887954..7340853ea 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -215,18 +215,15 @@ Span elfLoadSymbol(Span elf, const char *symbol) * \var IPAModuleInfo::pipelineVersion * \brief The pipeline handler version that the IPA module is for * - * \var IPAModuleInfo::pipelineName - * \brief The name of the pipeline handler that the IPA module is for - * - * This name is used to match a pipeline handler with the module. - * * \var IPAModuleInfo::name * \brief The name of the IPA module * - * The name may be used to build file system paths to IPA-specific resources. - * It shall only contain printable characters, and may not contain '*', '?' or - * '\'. For IPA modules included in libcamera, it shall match the directory of - * the IPA module in the source tree. + * This name is used to match a the IPA module. + * + * The name may also be used to build file system paths to IPA-specific + * resources. It shall only contain printable characters, and may not contain + * '*', '?' or '\'. For IPA modules included in libcamera, it shall match the + * directory of the IPA module in the source tree. * * \todo Allow user to choose to isolate open source IPAs */ diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index 1c97da324..af71c3285 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -37,12 +37,10 @@ protected: cerr << "IPA module information mismatch: expected:" << endl << "moduleAPIVersion = " << testInfo.moduleAPIVersion << endl << "pipelineVersion = " << testInfo.pipelineVersion << endl - << "pipelineName = " << testInfo.pipelineName << endl << "name = " << testInfo.name << "got: " << endl << "moduleAPIVersion = " << info.moduleAPIVersion << endl << "pipelineVersion = " << info.pipelineVersion << endl - << "pipelineName = " << info.pipelineName << endl << "name = " << info.name << endl; } @@ -58,7 +56,6 @@ protected: IPA_MODULE_API_VERSION, 0, "vimc", - "vimc", }; count += runTest("src/ipa/vimc/ipa_vimc.so", testInfo);