media: atomisp: pipe_binarydesc: drop logic incompatible with firmware

As we're using this firmware for ISP2401:
	https://github.com/intel-aero/meta-intel-aero-base/blob/master/recipes-kernel/linux/linux-yocto/shisp_2401a0_v21.bin

Revert some changes that are not compatible with it, making
the code close to the Intel Aero one.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
index d09cc486e33e381e394508cfccf3ed5e4e65de8c..7dd0e4a53c8bf55c0613f1057b153b33955ff762 100644 (file)
--- a/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
+++ b/drivers/staging/media/atomisp/pci/camera/pipe/src/pipe_binarydesc.c
@@ -601,16 +601,9 @@ void ia_css_pipe_get_primary_binarydesc(
                 * since it has better performance. */
                if (pipe_version == IA_CSS_PIPE_VERSION_2_6_1)
                        prim_descr->striped = false;
-               else if (!IS_ISP2401) {
+               else
                        prim_descr->striped = prim_descr->continuous &&
                                              (!pipe->stream->stop_copy_preview || !pipe->stream->disable_cont_vf);
-               } else {
-                       prim_descr->striped = prim_descr->continuous && !pipe->stream->disable_cont_vf;
-
-                       if ((pipe->config.default_capture_config.enable_xnr != 0) &&
-                           (pipe->extra_config.enable_dvs_6axis == true))
-                               prim_descr->enable_xnr = true;
-               }
        }
        IA_CSS_LEAVE_PRIVATE("");
 }
@@ -842,14 +835,7 @@ void ia_css_pipe_get_ldc_binarydesc(
        assert(out_info);
        IA_CSS_ENTER_PRIVATE("");
 
-       if (!IS_ISP2401) {
-               *in_info = *out_info;
-       } else {
-               if (pipe->out_yuv_ds_input_info.res.width)
-                       *in_info = pipe->out_yuv_ds_input_info;
-               else
-                       *in_info = *out_info;
-       }
+       *in_info = *out_info;
 
        in_info->format = IA_CSS_FRAME_FORMAT_YUV420;
        in_info->raw_bit_depth = 0;