media: atomisp: Remove online_process setting

online_process is always true, remove it.

Link: https://lore.kernel.org/r/20230221145906.8113-11-hdegoede@redhat.com
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
index 6645ee5d61d86087043920024c1c954f434c9f4e..cb9868e2172309c5988977a871785e56d3979c59 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_cmd.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_cmd.c
@@ -1622,11 +1622,6 @@ int atomisp_formats(struct atomisp_sub_device *asd, int flag,
 void atomisp_free_internal_buffers(struct atomisp_sub_device *asd)
 {
        atomisp_free_css_parameters(&asd->params.css_param);
-
-       if (asd->raw_output_frame) {
-               ia_css_frame_free(asd->raw_output_frame);
-               asd->raw_output_frame = NULL;
-       }
 }
 
 static void atomisp_update_grid_info(struct atomisp_sub_device *asd,
@@ -4216,7 +4211,6 @@ static int css_input_resolution_changed(struct atomisp_sub_device *asd,
 
 static int atomisp_set_fmt_to_isp(struct video_device *vdev,
                                  struct ia_css_frame_info *output_info,
-                                 struct ia_css_frame_info *raw_output_info,
                                  struct v4l2_pix_format *pix,
                                  unsigned int source_pad)
 {
@@ -4367,20 +4361,13 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,
 
                /* in case of ANR, force capture pipe to offline mode */
                atomisp_css_capture_enable_online(asd, ATOMISP_INPUT_STREAM_GENERAL,
-                                                 asd->params.low_light ?
-                                                 false : asd->params.online_process);
+                                                 !asd->params.low_light);
 
                configure_output = atomisp_css_capture_configure_output;
                get_frame_info = atomisp_css_capture_get_output_frame_info;
                configure_pp_input = atomisp_css_capture_configure_pp_input;
                pipe_id = IA_CSS_PIPE_ID_CAPTURE;
 
-               if (!asd->params.online_process) {
-                       ret = atomisp_css_capture_get_output_raw_frame_info(asd,
-                               raw_output_info);
-                       if (ret)
-                               return ret;
-               }
                if (asd->run_mode->val != ATOMISP_RUN_MODE_STILL_CAPTURE) {
                        dev_err(isp->dev,
                                "Need to set the running mode first\n");
@@ -4425,16 +4412,6 @@ static int atomisp_set_fmt_to_isp(struct video_device *vdev,
        }
 
        atomisp_update_grid_info(asd, pipe_id, source_pad);
-
-       /* Free the raw_dump buffer first */
-       ia_css_frame_free(asd->raw_output_frame);
-       asd->raw_output_frame = NULL;
-
-       if (!asd->params.online_process &&
-           ia_css_frame_allocate_from_info(&asd->raw_output_frame,
-                   raw_output_info))
-               return -ENOMEM;
-
        return 0;
 }
 
@@ -4590,7 +4567,7 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
        struct atomisp_sub_device *asd = pipe->asd;
        const struct atomisp_format_bridge *format_bridge;
        const struct atomisp_format_bridge *snr_format_bridge;
-       struct ia_css_frame_info output_info, raw_output_info;
+       struct ia_css_frame_info output_info;
        struct v4l2_pix_format snr_fmt;
        struct v4l2_pix_format backup_fmt, s_fmt;
        unsigned int dvs_env_w = 0, dvs_env_h = 0;
@@ -4900,8 +4877,7 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f)
        }
 
 set_fmt_to_isp:
-       ret = atomisp_set_fmt_to_isp(vdev, &output_info, &raw_output_info,
-                                    &f->fmt.pix, source_pad);
+       ret = atomisp_set_fmt_to_isp(vdev, &output_info, &f->fmt.pix, source_pad);
        if (ret) {
                dev_warn(isp->dev, "Can't set format on ISP. Error %d\n", ret);
                return -EINVAL;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp_compat.h
index 06d54c9bcb49a6da87eaa8ff4c5338109105da4f..7075099227848a962e0a59d4b629d73c9d9f3c60 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat.h
@@ -303,10 +303,6 @@ int atomisp_css_copy_get_output_frame_info(
     unsigned int stream_index,
     struct ia_css_frame_info *info);
 
-int atomisp_css_capture_get_output_raw_frame_info(
-    struct atomisp_sub_device *asd,
-    struct ia_css_frame_info *info);
-
 int atomisp_css_preview_get_output_frame_info(
     struct atomisp_sub_device *asd,
     struct ia_css_frame_info *info);

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index d998719a19ddc1d6577543a80cdccbd465610080..3bb1157c55c546307d4a10222114944c5a55e5d3 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -2640,14 +2640,6 @@ int atomisp_css_capture_get_viewfinder_frame_info(
                                ATOMISP_CSS_VF_FRAME, IA_CSS_PIPE_ID_CAPTURE);
 }
 
-int atomisp_css_capture_get_output_raw_frame_info(
-    struct atomisp_sub_device *asd,
-    struct ia_css_frame_info *info)
-{
-       return __get_frame_info(asd, ATOMISP_INPUT_STREAM_GENERAL, info,
-                               ATOMISP_CSS_RAW_FRAME, IA_CSS_PIPE_ID_CAPTURE);
-}
-
 int atomisp_css_copy_get_output_frame_info(
     struct atomisp_sub_device *asd,
     unsigned int stream_index,

diff --git a/drivers/staging/media/atomisp/pci/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp_fops.c
index d8d4c412f66a65d004c017506de057b71b9fc4d8..7f757f510190fa532f360eece8967144e44bab50 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_fops.c
@@ -564,7 +564,6 @@ static void atomisp_subdev_init_struct(struct atomisp_sub_device *asd)
        asd->params.fpn_en = false;
        asd->params.xnr_en = false;
        asd->params.false_color = 0;
-       asd->params.online_process = 1;
        asd->params.yuv_ds_en = 0;
        /* s3a grid not enabled for any pipe */
        asd->params.s3a_enabled_pipe = IA_CSS_PIPE_ID_NUM;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.h b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
index df6e2a8c5f844cf45a03fdd870be7fd12721cc91..bcb0fe8d05387f45b9ed450d593a3f64c020e83e 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
@@ -183,9 +183,6 @@ struct atomisp_css_params {
 };
 
 struct atomisp_subdev_params {
-       /* FIXME: Determines whether raw capture buffer are being passed to
-        * user space. Unimplemented for now. */
-       int online_process;
        int yuv_ds_en;
        unsigned int color_effect;
        bool gdc_cac_en;
@@ -303,7 +300,6 @@ struct atomisp_sub_device {
        spinlock_t dis_stats_lock;
 
        struct ia_css_frame *vf_frame; /* TODO: needed? */
-       struct ia_css_frame *raw_output_frame;
        enum atomisp_frame_status frame_status[VIDEO_MAX_FRAME];
 
        /* This field specifies which camera (v4l2 input) is selected. */