media: Revert "media: vimc: propagate pixel format in the stream"

This reverts commit b6c61a6c37317efd7327199bfe24770af3d7e799.

The requested pixelformat is being propagated from the capture to the
tpg in the sensor.

This was a bad design choice, as we start having the following issues:

* We set a pixelformat in the capture;
* We set matching media bus formats in the subdevices pads;
* Link validate looks fine (sizes matches, media bus formats matches);
* Issue: if some of the subdevice doesn't know how to generate the
requested pixelformat in the capture, then stream_on fails. This is bad
because capture says it supports that pixelformat, everything looks
fine, but it is not, and there is no way to find it out through the
links.

This patch was implemented so we could request any pixelformat from the
pipeline regardeless of the media bus format configured between pads.
Not all pixelformat can be mapped into a media bus code (e.g.
multiplanar formats), so with this patch we could request those
pixelformats from the tpg.

Solution: map pixelformats to media bus codes as before, and implement
conversions to other pixelformats in the capture to support multiplanar.

So first step to this solution is to revert this patch.

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

1 files changed, 36 insertions, 15 deletions

diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c
index c47454cc7f70..6c53b9fc1617 100644
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -55,13 +55,34 @@ static int vimc_sen_init_cfg(struct v4l2_subdev *sd,
         return 0;
 }
 
+static int vimc_sen_enum_mbus_code(struct v4l2_subdev *sd,
+                                   struct v4l2_subdev_pad_config *cfg,
+                                   struct v4l2_subdev_mbus_code_enum *code)
+{
+        const struct vimc_pix_map *vpix = vimc_pix_map_by_index(code->index);
+
+        if (!vpix)
+                return -EINVAL;
+
+        code->code = vpix->code;
+
+        return 0;
+}
+
 static int vimc_sen_enum_frame_size(struct v4l2_subdev *sd,
                                     struct v4l2_subdev_pad_config *cfg,
                                     struct v4l2_subdev_frame_size_enum *fse)
 {
+        const struct vimc_pix_map *vpix;
+
         if (fse->index)
                 return -EINVAL;
 
+        /* Only accept code in the pix map table */
+        vpix = vimc_pix_map_by_code(fse->code);
+        if (!vpix)
+                return -EINVAL;
+
         fse->min_width = VIMC_FRAME_MIN_WIDTH;
         fse->max_width = VIMC_FRAME_MAX_WIDTH;
         fse->min_height = VIMC_FRAME_MIN_HEIGHT;
@@ -86,17 +107,14 @@ static int vimc_sen_get_fmt(struct v4l2_subdev *sd,
 
 static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen)
 {
-        u32 pixelformat = vsen->ved.stream->producer_pixfmt;
-        const struct v4l2_format_info *pix_info;
-
-        pix_info = v4l2_format_info(pixelformat);
+        const struct vimc_pix_map *vpix =
+                                vimc_pix_map_by_code(vsen->mbus_format.code);
 
         tpg_reset_source(&vsen->tpg, vsen->mbus_format.width,
                          vsen->mbus_format.height, vsen->mbus_format.field);
-        tpg_s_bytesperline(&vsen->tpg, 0,
-                           vsen->mbus_format.width * pix_info->bpp[0]);
+        tpg_s_bytesperline(&vsen->tpg, 0, vsen->mbus_format.width * vpix->bpp);
         tpg_s_buf_height(&vsen->tpg, vsen->mbus_format.height);
-        tpg_s_fourcc(&vsen->tpg, pixelformat);
+        tpg_s_fourcc(&vsen->tpg, vpix->pixelformat);
         /* TODO: add support for V4L2_FIELD_ALTERNATE */
         tpg_s_field(&vsen->tpg, vsen->mbus_format.field, false);
         tpg_s_colorspace(&vsen->tpg, vsen->mbus_format.colorspace);
@@ -107,6 +125,13 @@ static void vimc_sen_tpg_s_format(struct vimc_sen_device *vsen)
 
 static void vimc_sen_adjust_fmt(struct v4l2_mbus_framefmt *fmt)
 {
+        const struct vimc_pix_map *vpix;
+
+        /* Only accept code in the pix map table */
+        vpix = vimc_pix_map_by_code(fmt->code);
+        if (!vpix)
+                fmt->code = fmt_default.code;
+
         fmt->width = clamp_t(u32, fmt->width, VIMC_FRAME_MIN_WIDTH,
                              VIMC_FRAME_MAX_WIDTH) & ~1;
         fmt->height = clamp_t(u32, fmt->height, VIMC_FRAME_MIN_HEIGHT,
@@ -126,9 +151,6 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,
         struct vimc_sen_device *vsen = v4l2_get_subdevdata(sd);
         struct v4l2_mbus_framefmt *mf;
 
-        if (!vimc_mbus_code_supported(fmt->format.code))
-                fmt->format.code = fmt_default.code;
-
         if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                 /* Do not change the format while stream is on */
                 if (vsen->frame)
@@ -161,7 +183,7 @@ static int vimc_sen_set_fmt(struct v4l2_subdev *sd,
 
 static const struct v4l2_subdev_pad_ops vimc_sen_pad_ops = {
         .init_cfg               = vimc_sen_init_cfg,
-        .enum_mbus_code         = vimc_enum_mbus_code,
+        .enum_mbus_code         = vimc_sen_enum_mbus_code,
         .enum_frame_size        = vimc_sen_enum_frame_size,
         .get_fmt                = vimc_sen_get_fmt,
         .set_fmt                = vimc_sen_set_fmt,
@@ -183,8 +205,7 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
                                 container_of(sd, struct vimc_sen_device, sd);
 
         if (enable) {
-                u32 pixelformat = vsen->ved.stream->producer_pixfmt;
-                const struct v4l2_format_info *pix_info;
+                const struct vimc_pix_map *vpix;
                 unsigned int frame_size;
 
                 if (vsen->kthread_sen)
@@ -192,8 +213,8 @@ static int vimc_sen_s_stream(struct v4l2_subdev *sd, int enable)
                         return 0;
 
                 /* Calculate the frame size */
-                pix_info = v4l2_format_info(pixelformat);
-                frame_size = vsen->mbus_format.width * pix_info->bpp[0] *
+                vpix = vimc_pix_map_by_code(vsen->mbus_format.code);
+                frame_size = vsen->mbus_format.width * vpix->bpp *
                              vsen->mbus_format.height;
 
                 /*