media: vimc: Remove or modify stream checks

Change the way subdevices check if the stream is running. Verify the stream
pointer instead of src_frame. This makes easier to get rid of the void* and
u8* that points to frames in the subdevices structs.

Remove checks that s_stream does on subdevices. They are redundant since
the Media Controller Framework doesn't allow two streaming on the same
media pipeline at the same time.

Signed-off-by: André Almeida <andrealmeid@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.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 281f9c1a7249ad1d4cd2d33fb52e495d063bc090..b221f26e01cf540c3698734206fcc74e5c4ec24f 100644 (file)
--- a/drivers/media/platform/vimc/vimc-debayer.c
+++ b/drivers/media/platform/vimc/vimc-debayer.c
@@ -270,7 +270,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->src_frame)
+               if (vdeb->ved.stream)
                        return -EBUSY;
 
                sink_fmt = &vdeb->sink_fmt;
@@ -337,9 +337,6 @@ 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 8aecf8e9203106084d66ccbd8afc7a2dca139eed..617f2920b86b98f2e9085c42363711aa418081ec 100644 (file)
--- a/drivers/media/platform/vimc/vimc-scaler.c
+++ b/drivers/media/platform/vimc/vimc-scaler.c
@@ -158,7 +158,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->src_frame)
+               if (vsca->ved.stream)
                        return -EBUSY;
 
                sink_fmt = &vsca->sink_fmt;
@@ -213,9 +213,6 @@ 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);
@@ -337,7 +334,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 (!vsca->src_frame)
+       if (!ved->stream)
                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 baca9ca67ce0af0bdd28f7a8271b9257c1eb4b5a..d70f1a1408f106ccab34d2d95c33f364766b2ecc 100644 (file)
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -141,7 +141,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->frame)
+               if (vsen->ved.stream)
                        return -EBUSY;
 
                mf = &vsen->mbus_format;
@@ -197,10 +197,6 @@ 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] *