| Message ID | 20260618-rppx1-ipa-v1-2-32337264cfcd@ideasonboard.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
Hi Jacopo, Thanks for your work. On 2026-06-18 12:18:41 +0200, Jacopo Mondi wrote: > 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: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > 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 3507a6d7678a..436ec82d7750 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 4bdc4b7677fe..42d475ecc63a 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 1d3af0627fdb..47bcd3748f7f 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 58ef163d85ad..e0dde542c71a 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 de2a6afeb8c1..975d8bfdf8a5 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 b6ca44e7a0a0..f30eee7ff012 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 629e1a32de8a..d4ab91e30bf1 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 4162b848f7b1..bae48ea90662 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 0bd6f14626fe..53cea6b187e8 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 1c97da3242a7..af71c3285328 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); > > -- > 2.54.0 >
diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h index 3507a6d7678a..436ec82d7750 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 4bdc4b7677fe..42d475ecc63a 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 1d3af0627fdb..47bcd3748f7f 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 58ef163d85ad..e0dde542c71a 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 de2a6afeb8c1..975d8bfdf8a5 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 b6ca44e7a0a0..f30eee7ff012 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 629e1a32de8a..d4ab91e30bf1 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 4162b848f7b1..bae48ea90662 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 0bd6f14626fe..53cea6b187e8 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 1c97da3242a7..af71c3285328 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);