media: staging: rkisp1: add a helper function to enumerate supported mbus formats...

Add a function 'rkisp1_cap_enum_mbus_codes' that receive
a pointer to 'v4l2_subdev_mbus_code_enum' and returns the
next supported mbus format of the capture. The function
assumes that pixel formats with identical 'mbus' are grouped
together in the hardcoded arrays, therefore the order of the
entries in the array 'rkisp1_sp_fmts' are adjusted.
This function is a helper for the media bus enumeration of
the source pad of the resizer entity.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@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+huawei@kernel.org>

diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c
index 0527b4c1e80e509bd83a17a9d299897165d67004..53f49f00174e16ff17acd43678f4aa36f7266542 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -84,6 +84,10 @@ struct rkisp1_capture_config {
        } mi;
 };
 
+/*
+ * The supported pixel formats for mainpath. NOTE, pixel formats with identical 'mbus'
+ * are grouped together. This is assumed and used by the function rkisp1_cap_enum_mbus_codes
+ */
 static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
        /* yuv422 */
        {
@@ -112,6 +116,13 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
                .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
        },
+       /* yuv400 */
+       {
+               .fourcc = V4L2_PIX_FMT_GREY,
+               .uv_swap = 0,
+               .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
+               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
+       },
        /* yuv420 */
        {
                .fourcc = V4L2_PIX_FMT_NV21,
@@ -144,13 +155,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
                .mbus = MEDIA_BUS_FMT_YUYV8_1_5X8,
        },
-       /* yuv400 */
-       {
-               .fourcc = V4L2_PIX_FMT_GREY,
-               .uv_swap = 0,
-               .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
-               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
-       },
        /* raw */
        {
                .fourcc = V4L2_PIX_FMT_SRGGB8,
@@ -203,6 +207,10 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
        },
 };
 
+/*
+ * The supported pixel formats for selfpath. NOTE, pixel formats with identical 'mbus'
+ * are grouped together. This is assumed and used by the function rkisp1_cap_enum_mbus_codes
+ */
 static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
        /* yuv422 */
        {
@@ -236,6 +244,26 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
                .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
        },
+       /* yuv400 */
+       {
+               .fourcc = V4L2_PIX_FMT_GREY,
+               .uv_swap = 0,
+               .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
+               .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV400,
+               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
+       },
+       /* rgb */
+       {
+               .fourcc = V4L2_PIX_FMT_XBGR32,
+               .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
+               .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB888,
+               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
+       }, {
+               .fourcc = V4L2_PIX_FMT_RGB565,
+               .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
+               .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB565,
+               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
+       },
        /* yuv420 */
        {
                .fourcc = V4L2_PIX_FMT_NV21,
@@ -274,26 +302,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
                .mbus = MEDIA_BUS_FMT_YUYV8_1_5X8,
        },
-       /* yuv400 */
-       {
-               .fourcc = V4L2_PIX_FMT_GREY,
-               .uv_swap = 0,
-               .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
-               .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV400,
-               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
-       },
-       /* rgb */
-       {
-               .fourcc = V4L2_PIX_FMT_XBGR32,
-               .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
-               .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB888,
-               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
-       }, {
-               .fourcc = V4L2_PIX_FMT_RGB565,
-               .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
-               .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB565,
-               .mbus = MEDIA_BUS_FMT_YUYV8_2X8,
-       },
 };
 
 static const struct rkisp1_capture_config rkisp1_capture_config_mp = {
@@ -334,6 +342,30 @@ rkisp1_vdev_to_node(struct video_device *vdev)
        return container_of(vdev, struct rkisp1_vdev_node, vdev);
 }
 
+int rkisp1_cap_enum_mbus_codes(struct rkisp1_capture *cap,
+                              struct v4l2_subdev_mbus_code_enum *code)
+{
+       const struct rkisp1_capture_fmt_cfg *fmts = cap->config->fmts;
+       /*
+        * initialize curr_mbus to non existing mbus code 0 to ensure it is
+        * different from fmts[0].mbus
+        */
+       u32 curr_mbus = 0;
+       int i, n = 0;
+
+       for (i = 0; i < cap->config->fmt_size; i++) {
+               if (fmts[i].mbus == curr_mbus)
+                       continue;
+
+               curr_mbus = fmts[i].mbus;
+               if (n++ == code->index) {
+                       code->code = curr_mbus;
+                       return 0;
+               }
+       }
+       return -EINVAL;
+}
+
 /* ----------------------------------------------------------------------------
  * Stream operations for self-picture path (sp) and main-picture path (mp)
  */

diff --git a/drivers/staging/media/rkisp1/rkisp1-common.h b/drivers/staging/media/rkisp1/rkisp1-common.h
index 992d8ec4c4484bbf1169b94f7cc8eafcdb13e626..8cdfcaab268e6fd8ef28215180b9bc1c56c5bbad 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-common.h
+++ b/drivers/staging/media/rkisp1/rkisp1-common.h
@@ -410,6 +410,17 @@ static inline u32 rkisp1_read(struct rkisp1_device *rkisp1, unsigned int addr)
        return readl(rkisp1->base_addr + addr);
 }
 
+/*
+ * rkisp1_cap_enum_mbus_codes - A helper function that return the i'th supported mbus code
+ *                             of the capture entity. This is used to enumerate the supported
+ *                             mbus codes on the source pad of the resizer.
+ *
+ * @cap:  the capture entity
+ * @code: the mbus code, the function reads the code->index and fills the code->code
+ */
+int rkisp1_cap_enum_mbus_codes(struct rkisp1_capture *cap,
+                              struct v4l2_subdev_mbus_code_enum *code);
+
 /*
  * rkisp1_sd_adjust_crop_rect - adjust a rectangle to fit into another rectangle.
  *