| Message ID | 20260722-pi4-upstream-v2-1-eb44d3c6fd92@ideasonboard.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series |
|
| Related | show |
Quoting Jai Luthra (2026-07-22 20:23:17) > In IPABase::platformPrepareIsp() we pass PrepareParams but none of the > IPAs (vc4 and pisp) use them. So drop it. > > Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> > --- > src/ipa/rpi/common/ipa_base.cpp | 2 +- > src/ipa/rpi/common/ipa_base.h | 3 +-- > src/ipa/rpi/pisp/pisp.cpp | 6 ++---- > src/ipa/rpi/vc4/vc4.cpp | 5 ++--- > 4 files changed, 6 insertions(+), 10 deletions(-) > > diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp > index dacafa578..e3f7b99a8 100644 > --- a/src/ipa/rpi/common/ipa_base.cpp > +++ b/src/ipa/rpi/common/ipa_base.cpp > @@ -507,7 +507,7 @@ void IpaBase::prepareIsp(const PrepareParams ¶ms) > if (processPending_) { > controller_.prepare(&rpiMetadata); > /* Actually prepare the ISP parameters for the frame. */ > - platformPrepareIsp(params, rpiMetadata); > + platformPrepareIsp(rpiMetadata); > platformPrepareAgc(rpiMetadata); > } else > platformPrepareAgc(rpiMetadata); > diff --git a/src/ipa/rpi/common/ipa_base.h b/src/ipa/rpi/common/ipa_base.h > index 90f018b28..f4157e9ec 100644 > --- a/src/ipa/rpi/common/ipa_base.h > +++ b/src/ipa/rpi/common/ipa_base.h > @@ -87,8 +87,7 @@ private: > virtual int32_t platformStart(const ControlList &controls, StartResult *result) = 0; > virtual int32_t platformConfigure(const ConfigParams ¶ms, ConfigResult *result) = 0; > > - virtual void platformPrepareIsp(const PrepareParams ¶ms, > - RPiController::Metadata &rpiMetadata) = 0; > + virtual void platformPrepareIsp(RPiController::Metadata &rpiMetadata) = 0; > virtual void platformPrepareAgc(RPiController::Metadata &rpiMetadata) = 0; > virtual RPiController::StatisticsPtr platformProcessStats(Span<uint8_t> mem) = 0; > > diff --git a/src/ipa/rpi/pisp/pisp.cpp b/src/ipa/rpi/pisp/pisp.cpp > index fd28fc385..025103808 100644 > --- a/src/ipa/rpi/pisp/pisp.cpp > +++ b/src/ipa/rpi/pisp/pisp.cpp > @@ -232,8 +232,7 @@ private: > int32_t platformStart(const ControlList &controls, StartResult *result) override; > int32_t platformConfigure(const ConfigParams ¶ms, ConfigResult *result) override; > > - void platformPrepareIsp(const PrepareParams ¶ms, > - RPiController::Metadata &rpiMetadata) override; > + void platformPrepareIsp(RPiController::Metadata &rpiMetadata) override; > void platformPrepareAgc(RPiController::Metadata &rpiMetadata) override; > RPiController::StatisticsPtr platformProcessStats(Span<uint8_t> mem) override; > > @@ -354,8 +353,7 @@ int32_t IpaPiSP::platformConfigure([[maybe_unused]] const ConfigParams ¶ms, > return 0; > } > > -void IpaPiSP::platformPrepareIsp([[maybe_unused]] const PrepareParams ¶ms, > - RPiController::Metadata &rpiMetadata) > +void IpaPiSP::platformPrepareIsp(RPiController::Metadata &rpiMetadata) > { > std::scoped_lock<RPiController::Metadata> l(rpiMetadata); > > diff --git a/src/ipa/rpi/vc4/vc4.cpp b/src/ipa/rpi/vc4/vc4.cpp > index b6ca44e7a..052204d25 100644 > --- a/src/ipa/rpi/vc4/vc4.cpp > +++ b/src/ipa/rpi/vc4/vc4.cpp > @@ -59,7 +59,7 @@ private: > int32_t platformStart(const ControlList &controls, StartResult *result) override; > int32_t platformConfigure(const ConfigParams ¶ms, ConfigResult *result) override; > > - void platformPrepareIsp(const PrepareParams ¶ms, RPiController::Metadata &rpiMetadata) override; > + void platformPrepareIsp(RPiController::Metadata &rpiMetadata) override; > void platformPrepareAgc([[maybe_unused]] RPiController::Metadata &rpiMetadata) override; > RPiController::StatisticsPtr platformProcessStats(Span<uint8_t> mem) override; > > @@ -144,8 +144,7 @@ int32_t IpaVc4::platformConfigure(const ConfigParams ¶ms, [[maybe_unused]] C > return 0; > } > > -void IpaVc4::platformPrepareIsp([[maybe_unused]] const PrepareParams ¶ms, > - RPiController::Metadata &rpiMetadata) > +void IpaVc4::platformPrepareIsp(RPiController::Metadata &rpiMetadata) > { > ControlList &ctrls = ctrls_; > > > -- > 2.54.0 >
diff --git a/src/ipa/rpi/common/ipa_base.cpp b/src/ipa/rpi/common/ipa_base.cpp index dacafa578..e3f7b99a8 100644 --- a/src/ipa/rpi/common/ipa_base.cpp +++ b/src/ipa/rpi/common/ipa_base.cpp @@ -507,7 +507,7 @@ void IpaBase::prepareIsp(const PrepareParams ¶ms) if (processPending_) { controller_.prepare(&rpiMetadata); /* Actually prepare the ISP parameters for the frame. */ - platformPrepareIsp(params, rpiMetadata); + platformPrepareIsp(rpiMetadata); platformPrepareAgc(rpiMetadata); } else platformPrepareAgc(rpiMetadata); diff --git a/src/ipa/rpi/common/ipa_base.h b/src/ipa/rpi/common/ipa_base.h index 90f018b28..f4157e9ec 100644 --- a/src/ipa/rpi/common/ipa_base.h +++ b/src/ipa/rpi/common/ipa_base.h @@ -87,8 +87,7 @@ private: virtual int32_t platformStart(const ControlList &controls, StartResult *result) = 0; virtual int32_t platformConfigure(const ConfigParams ¶ms, ConfigResult *result) = 0; - virtual void platformPrepareIsp(const PrepareParams ¶ms, - RPiController::Metadata &rpiMetadata) = 0; + virtual void platformPrepareIsp(RPiController::Metadata &rpiMetadata) = 0; virtual void platformPrepareAgc(RPiController::Metadata &rpiMetadata) = 0; virtual RPiController::StatisticsPtr platformProcessStats(Span<uint8_t> mem) = 0; diff --git a/src/ipa/rpi/pisp/pisp.cpp b/src/ipa/rpi/pisp/pisp.cpp index fd28fc385..025103808 100644 --- a/src/ipa/rpi/pisp/pisp.cpp +++ b/src/ipa/rpi/pisp/pisp.cpp @@ -232,8 +232,7 @@ private: int32_t platformStart(const ControlList &controls, StartResult *result) override; int32_t platformConfigure(const ConfigParams ¶ms, ConfigResult *result) override; - void platformPrepareIsp(const PrepareParams ¶ms, - RPiController::Metadata &rpiMetadata) override; + void platformPrepareIsp(RPiController::Metadata &rpiMetadata) override; void platformPrepareAgc(RPiController::Metadata &rpiMetadata) override; RPiController::StatisticsPtr platformProcessStats(Span<uint8_t> mem) override; @@ -354,8 +353,7 @@ int32_t IpaPiSP::platformConfigure([[maybe_unused]] const ConfigParams ¶ms, return 0; } -void IpaPiSP::platformPrepareIsp([[maybe_unused]] const PrepareParams ¶ms, - RPiController::Metadata &rpiMetadata) +void IpaPiSP::platformPrepareIsp(RPiController::Metadata &rpiMetadata) { std::scoped_lock<RPiController::Metadata> l(rpiMetadata); diff --git a/src/ipa/rpi/vc4/vc4.cpp b/src/ipa/rpi/vc4/vc4.cpp index b6ca44e7a..052204d25 100644 --- a/src/ipa/rpi/vc4/vc4.cpp +++ b/src/ipa/rpi/vc4/vc4.cpp @@ -59,7 +59,7 @@ private: int32_t platformStart(const ControlList &controls, StartResult *result) override; int32_t platformConfigure(const ConfigParams ¶ms, ConfigResult *result) override; - void platformPrepareIsp(const PrepareParams ¶ms, RPiController::Metadata &rpiMetadata) override; + void platformPrepareIsp(RPiController::Metadata &rpiMetadata) override; void platformPrepareAgc([[maybe_unused]] RPiController::Metadata &rpiMetadata) override; RPiController::StatisticsPtr platformProcessStats(Span<uint8_t> mem) override; @@ -144,8 +144,7 @@ int32_t IpaVc4::platformConfigure(const ConfigParams ¶ms, [[maybe_unused]] C return 0; } -void IpaVc4::platformPrepareIsp([[maybe_unused]] const PrepareParams ¶ms, - RPiController::Metadata &rpiMetadata) +void IpaVc4::platformPrepareIsp(RPiController::Metadata &rpiMetadata) { ControlList &ctrls = ctrls_;
In IPABase::platformPrepareIsp() we pass PrepareParams but none of the IPAs (vc4 and pisp) use them. So drop it. Signed-off-by: Jai Luthra <jai.luthra@ideasonboard.com> --- src/ipa/rpi/common/ipa_base.cpp | 2 +- src/ipa/rpi/common/ipa_base.h | 3 +-- src/ipa/rpi/pisp/pisp.cpp | 6 ++---- src/ipa/rpi/vc4/vc4.cpp | 5 ++--- 4 files changed, 6 insertions(+), 10 deletions(-)