[v5,2/4] ipa: ipa_module: Remove pipelineName
diff mbox series

Message ID 20260512175340.115153-3-johannes.goede@oss.qualcomm.com
State New
Headers show
Series
  • ipa: Allow IPA creation by name
Related show

Commit Message

Hans de Goede May 12, 2026, 5:53 p.m. UTC 
From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>

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 <jacopo.mondi@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com>
---
 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(-)

Patch
diff mbox series 

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<const uint8_t> elfLoadSymbol(Span<const uint8_t> 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);