| Message ID | 20210302201603.21566-3-laurent.pinchart@ideasonboard.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series |
|
| Related | show |
Hi, On 02.03.21 21:16, Laurent Pinchart wrote: > The rkisp1 driver has received support for newer ISP versions, which > changes its userspace API and ABI. Adapt to the API change. This > requires kernel v5.11 or newer, or backporting the corresponding rkisp1 > changes to older kernels. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> > --- > src/ipa/rkisp1/rkisp1.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp > index 67bac986aff7..f11aeb40cb05 100644 > --- a/src/ipa/rkisp1/rkisp1.cpp > +++ b/src/ipa/rkisp1/rkisp1.cpp > @@ -216,7 +216,7 @@ void IPARkISP1::updateStatistics(unsigned int frame, > > unsigned int value = 0; > unsigned int num = 0; > - for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) { > + for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX_V10; i++) { > if (ae->exp_mean[i] <= 15) > continue; > >
Hi Laurent, On 02/03/2021 20:16, Laurent Pinchart wrote: > The rkisp1 driver has received support for newer ISP versions, which > changes its userspace API and ABI. Adapt to the API change. This > requires kernel v5.11 or newer, or backporting the corresponding rkisp1 > changes to older kernels. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Does this still compile with 1/2 applied? Or does it need to be squashed down? Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > --- > src/ipa/rkisp1/rkisp1.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp > index 67bac986aff7..f11aeb40cb05 100644 > --- a/src/ipa/rkisp1/rkisp1.cpp > +++ b/src/ipa/rkisp1/rkisp1.cpp > @@ -216,7 +216,7 @@ void IPARkISP1::updateStatistics(unsigned int frame, > > unsigned int value = 0; > unsigned int num = 0; > - for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) { > + for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX_V10; i++) { > if (ae->exp_mean[i] <= 15) > continue; > >
Hi Kieran, On Wed, Mar 03, 2021 at 04:32:59PM +0000, Kieran Bingham wrote: > On 02/03/2021 20:16, Laurent Pinchart wrote: > > The rkisp1 driver has received support for newer ISP versions, which > > changes its userspace API and ABI. Adapt to the API change. This > > requires kernel v5.11 or newer, or backporting the corresponding rkisp1 > > changes to older kernels. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Does this still compile with 1/2 applied? Or does it need to be squashed > down? I assume you mean with 1/2 but without 2/2. It will compile, but won't handle the stats properly in the IPA. > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > > > --- > > src/ipa/rkisp1/rkisp1.cpp | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp > > index 67bac986aff7..f11aeb40cb05 100644 > > --- a/src/ipa/rkisp1/rkisp1.cpp > > +++ b/src/ipa/rkisp1/rkisp1.cpp > > @@ -216,7 +216,7 @@ void IPARkISP1::updateStatistics(unsigned int frame, > > > > unsigned int value = 0; > > unsigned int num = 0; > > - for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) { > > + for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX_V10; i++) { > > if (ae->exp_mean[i] <= 15) > > continue; > >
On 03/03/2021 16:35, Laurent Pinchart wrote: > Hi Kieran, > > On Wed, Mar 03, 2021 at 04:32:59PM +0000, Kieran Bingham wrote: >> On 02/03/2021 20:16, Laurent Pinchart wrote: >>> The rkisp1 driver has received support for newer ISP versions, which >>> changes its userspace API and ABI. Adapt to the API change. This >>> requires kernel v5.11 or newer, or backporting the corresponding rkisp1 >>> changes to older kernels. >>> >>> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> >> >> Does this still compile with 1/2 applied? Or does it need to be squashed >> down? > > I assume you mean with 1/2 but without 2/2. It will compile, but won't > handle the stats properly in the IPA. That's fine, keep it separate then ;-) > >> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> >> >>> --- >>> src/ipa/rkisp1/rkisp1.cpp | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp >>> index 67bac986aff7..f11aeb40cb05 100644 >>> --- a/src/ipa/rkisp1/rkisp1.cpp >>> +++ b/src/ipa/rkisp1/rkisp1.cpp >>> @@ -216,7 +216,7 @@ void IPARkISP1::updateStatistics(unsigned int frame, >>> >>> unsigned int value = 0; >>> unsigned int num = 0; >>> - for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) { >>> + for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX_V10; i++) { >>> if (ae->exp_mean[i] <= 15) >>> continue; >>> >
diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 67bac986aff7..f11aeb40cb05 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -216,7 +216,7 @@ void IPARkISP1::updateStatistics(unsigned int frame, unsigned int value = 0; unsigned int num = 0; - for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX; i++) { + for (int i = 0; i < RKISP1_CIF_ISP_AE_MEAN_MAX_V10; i++) { if (ae->exp_mean[i] <= 15) continue;
The rkisp1 driver has received support for newer ISP versions, which changes its userspace API and ABI. Adapt to the API change. This requires kernel v5.11 or newer, or backporting the corresponding rkisp1 changes to older kernels. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- src/ipa/rkisp1/rkisp1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)