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

Message ID 20251003-ipa-match-by-name-v2-2-54f3cd828ddd@ideasonboard.com
State New
Headers show
Series
  • ipa: Allow IPA creation by name
Related show

Commit Message

Jacopo Mondi Oct. 3, 2025, 4:16 p.m. UTC 
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>
---
 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 3507a6d7678a3fd171c9239967d4667381ac3ea6..436ec82d7750d1ab7901499f4c4d88f0a173b563 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 1cae08bf255f6f53a0ebee02ba3aadda5a650ae3..a714024129b688b0579662ac7d6d9c3ffc15b62a 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 7d45e7310aecdae0e47655e6d2e8830e776d74cd..e52e89be7c7e34310ca866bcbea2134833e967db 100644
--- a/src/ipa/mali-c55/mali-c55.cpp
+++ b/src/ipa/mali-c55/mali-c55.cpp
@@ -387,7 +387,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 fa22bfc349043002345d275b11a60ac983e329d7..a8e46094bdb9c431eb9143cccfa88e8ae7a3c04f 100644
--- a/src/ipa/rkisp1/rkisp1.cpp
+++ b/src/ipa/rkisp1/rkisp1.cpp
@@ -480,7 +480,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 829b912585223a0296a9709aca433d5240caea1b..9424cb4d129dda541a3cc5f9bacac56dc44f15da 100644
--- a/src/ipa/rpi/pisp/pisp.cpp
+++ b/src/ipa/rpi/pisp/pisp.cpp
@@ -1089,7 +1089,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 b2fec934480487c0c0566d510afd7a72129e441c..dc3455642ec71865d73662e6cd2d42bba61cadb8 100644
--- a/src/ipa/rpi/vc4/vc4.cpp
+++ b/src/ipa/rpi/vc4/vc4.cpp
@@ -606,7 +606,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 b147aca2e3436cd79586063c4ee23f6698f266bf..9122f1c019ce1bb1c6a4d96e3fda664023391464 100644
--- a/src/ipa/simple/soft_simple.cpp
+++ b/src/ipa/simple/soft_simple.cpp
@@ -350,7 +350,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 a1351a0f45ce4ce6afed3151001eb74b10090c16..822e00aff2033e42254823b07ec396a50f71f182 100644
--- a/src/ipa/vimc/vimc.cpp
+++ b/src/ipa/vimc/vimc.cpp
@@ -202,7 +202,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 0bd6f14626fe2038072f48b70ca4341b0eb8cef5..53cea6b187e86f20628d3b51c47097836801b094 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 1c97da3242a7d558c52dce6ed3bc9b5f76742944..af71c3285328263da71643da97e7b8c440d9a7ad 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);