media: vimc: propagate pixel format in the stream

Media bus codes were being mapped to pixelformats, which causes a
limitation on vimc because not all pixelformats can be mapped to media
bus codes.
Also, media bus codes are an internal configuration from the device.
Userspace only assures media bus codes matches between pads and expects
the image in a given pixelformat. So we can allow almost any media bus
format to be configured between pads, except for debayer that expects a
media bus code of type bayer in the sink pad.

[hverkuil-cisco@xs4all.nl: drop use of v4l2_get_fourcc_name: not yet available]
[hverkuil-cisco@xs4all.nl: made vimc_mbus_list static]

Signed-off-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>

1 files changed, 30 insertions, 33 deletions

diff --git a/drivers/media/platform/vimc/vimc-scaler.c b/drivers/media/platform/vimc/vimc-scaler.c
index 2028afa4ef7a..8aecf8e92031 100644
--- a/drivers/media/platform/vimc/vimc-scaler.c
+++ b/drivers/media/platform/vimc/vimc-scaler.c
@@ -35,6 +35,12 @@ MODULE_PARM_DESC(sca_mult, " the image size multiplier");
 #define IS_SRC(pad)     (pad)
 #define MAX_ZOOM        8
 
+static const u32 vimc_sca_supported_pixfmt[] = {
+        V4L2_PIX_FMT_BGR24,
+        V4L2_PIX_FMT_RGB24,
+        V4L2_PIX_FMT_ARGB32,
+};
+
 struct vimc_sca_device {
         struct vimc_ent_device ved;
         struct v4l2_subdev sd;
@@ -57,6 +63,16 @@ static const struct v4l2_mbus_framefmt sink_fmt_default = {
         .colorspace = V4L2_COLORSPACE_DEFAULT,
 };
 
+static bool vimc_sca_is_pixfmt_supported(u32 pixelformat)
+{
+        unsigned int i;
+
+        for (i = 0; i < ARRAY_SIZE(vimc_sca_supported_pixfmt); i++)
+                if (vimc_sca_supported_pixfmt[i] == pixelformat)
+                        return true;
+        return false;
+}
+
 static int vimc_sca_init_cfg(struct v4l2_subdev *sd,
                              struct v4l2_subdev_pad_config *cfg)
 {
@@ -76,35 +92,13 @@ static int vimc_sca_init_cfg(struct v4l2_subdev *sd,
         return 0;
 }
 
-static int vimc_sca_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);
-
-        /* We don't support bayer format */
-        if (!vpix || vpix->bayer)
-                return -EINVAL;
-
-        code->code = vpix->code;
-
-        return 0;
-}
-
 static int vimc_sca_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 in non bayer format */
-        vpix = vimc_pix_map_by_code(fse->code);
-        if (!vpix || vpix->bayer)
-                return -EINVAL;
-
         fse->min_width = VIMC_FRAME_MIN_WIDTH;
         fse->min_height = VIMC_FRAME_MIN_HEIGHT;
 
@@ -141,13 +135,6 @@ static int vimc_sca_get_fmt(struct v4l2_subdev *sd,
 
 static void vimc_sca_adjust_sink_fmt(struct v4l2_mbus_framefmt *fmt)
 {
-        const struct vimc_pix_map *vpix;
-
-        /* Only accept code in the pix map table in non bayer format */
-        vpix = vimc_pix_map_by_code(fmt->code);
-        if (!vpix || vpix->bayer)
-                fmt->code = sink_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,
@@ -166,6 +153,9 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
         struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);
         struct v4l2_mbus_framefmt *sink_fmt;
 
+        if (!vimc_mbus_code_supported(fmt->format.code))
+                fmt->format.code = sink_fmt_default.code;
+
         if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
                 /* Do not change the format while stream is on */
                 if (vsca->src_frame)
@@ -208,7 +198,7 @@ static int vimc_sca_set_fmt(struct v4l2_subdev *sd,
 
 static const struct v4l2_subdev_pad_ops vimc_sca_pad_ops = {
         .init_cfg               = vimc_sca_init_cfg,
-        .enum_mbus_code         = vimc_sca_enum_mbus_code,
+        .enum_mbus_code         = vimc_enum_mbus_code,
         .enum_frame_size        = vimc_sca_enum_frame_size,
         .get_fmt                = vimc_sca_get_fmt,
         .set_fmt                = vimc_sca_set_fmt,
@@ -219,15 +209,22 @@ static int vimc_sca_s_stream(struct v4l2_subdev *sd, int enable)
         struct vimc_sca_device *vsca = v4l2_get_subdevdata(sd);
 
         if (enable) {
-                const struct vimc_pix_map *vpix;
+                u32 pixelformat = vsca->ved.stream->producer_pixfmt;
+                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);
+                        return -EINVAL;
+                }
+
                 /* Save the bytes per pixel of the sink */
-                vpix = vimc_pix_map_by_code(vsca->sink_fmt.code);
-                vsca->bpp = vpix->bpp;
+                pix_info = v4l2_format_info(pixelformat);
+                vsca->bpp = pix_info->bpp[0];
 
                 /* Calculate the width in bytes of the src frame */
                 vsca->src_line_size = vsca->sink_fmt.width *