media: Revert "media: vimc: Remove or modify stream checks"

This reverts commit 3c1b9ac753e99005d7ee0a883d6e5b577ba32aa9.

Required to Revert "media: vimc: propagate pixel format in the stream"
which introduced the stream object in the vimc_ent_device struct.

Signed-off-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Lucas A. M. Magalhaes <lucmaga@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/vimc/vimc-debayer.c b/drivers/media/platform/vimc/vimc-debayer.c
index 00598fbf3cba1cda3d20d69d79860601cc484707..72adba6cf8924e9149d3571436cf8c6bd74863c2 100644 (file)
--- a/drivers/media/platform/vimc/vimc-debayer.c
+++ b/drivers/media/platform/vimc/vimc-debayer.c
@@ -262,7 +262,7 @@ static int vimc_deb_set_fmt(struct v4l2_subdev *sd,
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                /* Do not change the format while stream is on */
-               if (vdeb->ved.stream)
+               if (vdeb->src_frame)
                        return -EBUSY;
 
                sink_fmt = &vdeb->sink_fmt;
@@ -329,6 +329,9 @@ static int vimc_deb_s_stream(struct v4l2_subdev *sd, int enable)
                const struct v4l2_format_info *pix_info;
                unsigned int frame_size;
 
+               if (vdeb->src_frame)
+                       return 0;
+
                /* We only support translating bayer to RGB24 */
                if (src_pixelformat != V4L2_PIX_FMT_RGB24) {
                        dev_err(vdeb->dev,

diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c
index c7123a45c55bcfaf654cb77d91592037f8cc121b..5f31c1e351a3074a0c5c4b28b0e4436c778fcc39 100644 (file)
--- a/drivers/media/platform/vimc/vimc-scaler.c
+++ b/drivers/media/platform/vimc/vimc-scaler.c
@@ -148,7 +148,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                /* Do not change the format while stream is on */
-               if (vsca->ved.stream)
+               if (vsca->src_frame)
                        return -EBUSY;
 
                sink_fmt = &vsca->sink_fmt;
@@ -203,6 +203,9 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
                const struct v4l2_format_info *pix_info;
                unsigned int frame_size;
 
+               if (vsca->src_frame)
+                       return 0;
+
                if (!vimc_sca_is_pixfmt_supported(pixelformat)) {
                        dev_err(vsca->dev, "pixfmt (0x%08x) is not supported\n",
                                pixelformat);
@@ -324,7 +327,7 @@ static void *vimc_sca_process_frame(struct vimc_ent_device *ved,
                                                    ved);
 
        /* If the stream in this node is not active, just return */
-       if (!ved->stream)
+       if (!vsca->src_frame)
                return ERR_PTR(-EINVAL);
 
        vimc_sca_fill_src_frame(vsca, sink_frame);

diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c
index 51359472eef29ffe851456b1ca16f64c92cf9b6f..c47454cc7f7076b28710249edc7fcd232ec33dcc 100644 (file)
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -131,7 +131,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,
 
        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                /* Do not change the format while stream is on */
-               if (vsen->ved.stream)
+               if (vsen->frame)
                        return -EBUSY;
 
                mf = &vsen->mbus_format;
@@ -187,6 +187,10 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
                const struct v4l2_format_info *pix_info;
                unsigned int frame_size;
 
+               if (vsen->kthread_sen)
+                       /* tpg is already executing */
+                       return 0;
+
                /* Calculate the frame size */
                pix_info = v4l2_format_info(pixelformat);
                frame_size = vsen->mbus_format.width * pix_info->bpp[0] *