| Message ID | 490e5002c3fea266524c31e1a94853dca9c3286c.1601551027.git.mchehab+huawei@kernel.org |
|---|---|
| State | Accepted |
| Commit | eb5f6b8ee9e4fcdda3807aff02a3df2d7ca51bbf |
| Headers | show |
| Series | [v3] media: atomisp: fixes build breakage for ISP2400 due to a cleanup | expand |
On Thu, Oct 1, 2020 at 2:17 PM Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > > A temporary var needed for building with ISP2400 was removed > by accident on a cleanup patch. > > Fix the breakage. Is this in any of your branches? > > Fixes: 852a53a02cf0 ("media: atomisp: get rid of unused vars") > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> > --- > drivers/staging/media/atomisp/pci/sh_css.c | 14 +++++++++++--- > 1 file changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c > index e8c5caf3dfe6..ddee04c8248d 100644 > --- a/drivers/staging/media/atomisp/pci/sh_css.c > +++ b/drivers/staging/media/atomisp/pci/sh_css.c > @@ -1365,7 +1365,6 @@ start_binary(struct ia_css_pipe *pipe, > { > assert(pipe); > /* Acceleration uses firmware, the binary thus can be NULL */ > - /* assert(binary != NULL); */ > > if (binary) > sh_css_metrics_start_binary(&binary->metrics); > @@ -1381,10 +1380,10 @@ start_binary(struct ia_css_pipe *pipe, > #endif > > #if !defined(ISP2401) > - if (stream->reconfigure_css_rx) { > + if (pipe->stream->reconfigure_css_rx) { > ia_css_isys_rx_configure(&pipe->stream->csi_rx_config, > pipe->stream->config.mode); > - stream->reconfigure_css_rx = false; > + pipe->stream->reconfigure_css_rx = false; > } > #endif > } > @@ -2820,6 +2819,8 @@ load_preview_binaries(struct ia_css_pipe *pipe) { > bool need_isp_copy_binary = false; > #ifdef ISP2401 > bool sensor = false; > +#else > + bool continuous; > #endif > /* preview only have 1 output pin now */ > struct ia_css_frame_info *pipe_out_info = &pipe->output_info[0]; > @@ -2833,6 +2834,8 @@ load_preview_binaries(struct ia_css_pipe *pipe) { > online = pipe->stream->config.online; > #ifdef ISP2401 > sensor = pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR; > +#else > + continuous = pipe->stream->config.continuous; > #endif > > if (mycs->preview_binary.info) > @@ -5987,6 +5990,8 @@ static int load_primary_binaries( > bool need_ldc = false; > #ifdef ISP2401 > bool sensor = false; > +#else > + bool memory, continuous; > #endif > struct ia_css_frame_info prim_in_info, > prim_out_info, > @@ -6009,6 +6014,9 @@ static int load_primary_binaries( > online = pipe->stream->config.online; > #ifdef ISP2401 > sensor = (pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR); > +#else > + memory = pipe->stream->config.mode == IA_CSS_INPUT_MODE_MEMORY; > + continuous = pipe->stream->config.continuous; > #endif > > mycs = &pipe->pipe_settings.capture; > -- > 2.26.2 > -- With Best Regards, Andy Shevchenko
Hi Andy, Em Thu, 1 Oct 2020 18:50:12 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> escreveu: > On Thu, Oct 1, 2020 at 2:17 PM Mauro Carvalho Chehab > <mchehab+huawei@kernel.org> wrote: > > > > A temporary var needed for building with ISP2400 was removed > > by accident on a cleanup patch. > > > > Fix the breakage. > > Is this in any of your branches? I added v3 of the fixes today at the media tree master branch. If no merge issues happen, it should be at tomorrow's linux-next. Thanks, Mauro
On Thu, Oct 1, 2020 at 6:55 PM Mauro Carvalho Chehab <mchehab+huawei@kernel.org> wrote: > Em Thu, 1 Oct 2020 18:50:12 +0300 > Andy Shevchenko <andy.shevchenko@gmail.com> escreveu: > > > On Thu, Oct 1, 2020 at 2:17 PM Mauro Carvalho Chehab > > <mchehab+huawei@kernel.org> wrote: > > > > > > A temporary var needed for building with ISP2400 was removed > > > by accident on a cleanup patch. > > > > > > Fix the breakage. > > > > Is this in any of your branches? > > I added v3 of the fixes today at the media tree master branch. > > If no merge issues happen, it should be at tomorrow's linux-next. Fixes the issue to me, thanks! Tested-by: Andy Shevchenko <andy.shevchenko@gmail.com> -- With Best Regards, Andy Shevchenko
diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c index e8c5caf3dfe6..ddee04c8248d 100644 --- a/drivers/staging/media/atomisp/pci/sh_css.c +++ b/drivers/staging/media/atomisp/pci/sh_css.c @@ -1365,7 +1365,6 @@ start_binary(struct ia_css_pipe *pipe, { assert(pipe); /* Acceleration uses firmware, the binary thus can be NULL */ - /* assert(binary != NULL); */ if (binary) sh_css_metrics_start_binary(&binary->metrics); @@ -1381,10 +1380,10 @@ start_binary(struct ia_css_pipe *pipe, #endif #if !defined(ISP2401) - if (stream->reconfigure_css_rx) { + if (pipe->stream->reconfigure_css_rx) { ia_css_isys_rx_configure(&pipe->stream->csi_rx_config, pipe->stream->config.mode); - stream->reconfigure_css_rx = false; + pipe->stream->reconfigure_css_rx = false; } #endif } @@ -2820,6 +2819,8 @@ load_preview_binaries(struct ia_css_pipe *pipe) { bool need_isp_copy_binary = false; #ifdef ISP2401 bool sensor = false; +#else + bool continuous; #endif /* preview only have 1 output pin now */ struct ia_css_frame_info *pipe_out_info = &pipe->output_info[0]; @@ -2833,6 +2834,8 @@ load_preview_binaries(struct ia_css_pipe *pipe) { online = pipe->stream->config.online; #ifdef ISP2401 sensor = pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR; +#else + continuous = pipe->stream->config.continuous; #endif if (mycs->preview_binary.info) @@ -5987,6 +5990,8 @@ static int load_primary_binaries( bool need_ldc = false; #ifdef ISP2401 bool sensor = false; +#else + bool memory, continuous; #endif struct ia_css_frame_info prim_in_info, prim_out_info, @@ -6009,6 +6014,9 @@ static int load_primary_binaries( online = pipe->stream->config.online; #ifdef ISP2401 sensor = (pipe->stream->config.mode == IA_CSS_INPUT_MODE_SENSOR); +#else + memory = pipe->stream->config.mode == IA_CSS_INPUT_MODE_MEMORY; + continuous = pipe->stream->config.continuous; #endif mycs = &pipe->pipe_settings.capture;
A temporary var needed for building with ISP2400 was removed by accident on a cleanup patch. Fix the breakage. Fixes: 852a53a02cf0 ("media: atomisp: get rid of unused vars") Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> --- drivers/staging/media/atomisp/pci/sh_css.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)