media: staging: rkisp1: cap: remove field fmt_type from struct rkisp1_capture_fmt_cfg

The pixel encoding can be retrieved from the cap->pix.info.
Therefore the field fmt_type can be removed from the
struct rkisp1_capture_fmt_cfg.

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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 9de98bc..5bb91a3 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-capture.c
+++ b/drivers/staging/media/rkisp1/rkisp1-capture.c
@@ -52,7 +52,6 @@ enum rkisp1_plane {
  */
 struct rkisp1_capture_fmt_cfg {
        u32 fourcc;
-       u8 fmt_type;
        u8 uv_swap;
        u32 write_format;
        u32 output_format;
@@ -87,133 +86,106 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_mp_fmts[] = {
        /* yuv422 */
        {
                .fourcc = V4L2_PIX_FMT_YUYV,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
        }, {
                .fourcc = V4L2_PIX_FMT_YVYU,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
        }, {
                .fourcc = V4L2_PIX_FMT_VYUY,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
        }, {
                .fourcc = V4L2_PIX_FMT_YUV422P,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        }, {
                .fourcc = V4L2_PIX_FMT_NV16,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA,
        }, {
                .fourcc = V4L2_PIX_FMT_NV61,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA,
        }, {
                .fourcc = V4L2_PIX_FMT_YVU422M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        },
        /* yuv420 */
        {
                .fourcc = V4L2_PIX_FMT_NV21,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA,
        }, {
                .fourcc = V4L2_PIX_FMT_NV12,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA,
        }, {
                .fourcc = V4L2_PIX_FMT_NV21M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA,
        }, {
                .fourcc = V4L2_PIX_FMT_NV12M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_SPLA,
        }, {
                .fourcc = V4L2_PIX_FMT_YUV420,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        }, {
                .fourcc = V4L2_PIX_FMT_YVU420,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        },
        /* yuv444 */
        {
                .fourcc = V4L2_PIX_FMT_YUV444M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        },
        /* yuv400 */
        {
                .fourcc = V4L2_PIX_FMT_GREY,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUVINT,
        },
        /* raw */
        {
                .fourcc = V4L2_PIX_FMT_SRGGB8,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        }, {
                .fourcc = V4L2_PIX_FMT_SGRBG8,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        }, {
                .fourcc = V4L2_PIX_FMT_SGBRG8,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        }, {
                .fourcc = V4L2_PIX_FMT_SBGGR8,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_YUV_PLA_OR_RAW8,
        }, {
                .fourcc = V4L2_PIX_FMT_SRGGB10,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SGRBG10,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SGBRG10,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SBGGR10,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SRGGB12,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SGRBG12,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SGBRG12,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        }, {
                .fourcc = V4L2_PIX_FMT_SBGGR12,
-               .fmt_type = V4L2_PIXEL_ENC_BAYER,
                .write_format = RKISP1_MI_CTRL_MP_WRITE_RAW12,
        },
 };
@@ -222,43 +194,36 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
        /* yuv422 */
        {
                .fourcc = V4L2_PIX_FMT_YUYV,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
        }, {
                .fourcc = V4L2_PIX_FMT_YVYU,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
        }, {
                .fourcc = V4L2_PIX_FMT_VYUY,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
        }, {
                .fourcc = V4L2_PIX_FMT_YUV422P,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
        }, {
                .fourcc = V4L2_PIX_FMT_NV16,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_SPLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
        }, {
                .fourcc = V4L2_PIX_FMT_NV61,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_SPLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
        }, {
                .fourcc = V4L2_PIX_FMT_YVU422M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV422,
@@ -266,37 +231,31 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
        /* yuv420 */
        {
                .fourcc = V4L2_PIX_FMT_NV21,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_SPLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
        }, {
                .fourcc = V4L2_PIX_FMT_NV12,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_SPLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
        }, {
                .fourcc = V4L2_PIX_FMT_NV21M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_SPLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
        }, {
                .fourcc = V4L2_PIX_FMT_NV12M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_SPLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
        }, {
                .fourcc = V4L2_PIX_FMT_YUV420,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
        }, {
                .fourcc = V4L2_PIX_FMT_YVU420,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 1,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV420,
@@ -304,7 +263,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
        /* yuv444 */
        {
                .fourcc = V4L2_PIX_FMT_YUV444M,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV444,
@@ -312,7 +270,6 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
        /* yuv400 */
        {
                .fourcc = V4L2_PIX_FMT_GREY,
-               .fmt_type = V4L2_PIXEL_ENC_YUV,
                .uv_swap = 0,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_INT,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_YUV400,
@@ -320,17 +277,14 @@ static const struct rkisp1_capture_fmt_cfg rkisp1_sp_fmts[] = {
        /* rgb */
        {
                .fourcc = V4L2_PIX_FMT_RGB24,
-               .fmt_type = V4L2_PIXEL_ENC_RGB,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB888,
        }, {
                .fourcc = V4L2_PIX_FMT_RGB565,
-               .fmt_type = V4L2_PIXEL_ENC_RGB,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB565,
        }, {
                .fourcc = V4L2_PIX_FMT_BGR666,
-               .fmt_type = V4L2_PIXEL_ENC_RGB,
                .write_format = RKISP1_MI_CTRL_SP_WRITE_PLA,
                .output_format = RKISP1_MI_CTRL_SP_OUTPUT_RGB666,
        },
@@ -504,13 +458,12 @@ static void rkisp1_sp_disable(struct rkisp1_capture *cap)
 
 static void rkisp1_mp_enable(struct rkisp1_capture *cap)
 {
-       const struct rkisp1_capture_fmt_cfg *isp_fmt = cap->pix.cfg;
        u32 mi_ctrl;
 
        rkisp1_mp_disable(cap);
 
        mi_ctrl = rkisp1_read(cap->rkisp1, RKISP1_CIF_MI_CTRL);
-       if (isp_fmt->fmt_type == V4L2_PIXEL_ENC_BAYER)
+       if (v4l2_is_format_bayer(cap->pix.info))
                mi_ctrl |= RKISP1_CIF_MI_CTRL_RAW_ENABLE;
        /* YUV */
        else
@@ -1260,7 +1213,7 @@ static int rkisp1_capture_link_validate(struct media_link *link)
                return -EPIPE;
        }
 
-       if (cap->pix.cfg->fmt_type != isp->src_fmt->fmt_type) {
+       if (cap->pix.info->pixel_enc != isp->src_fmt->fmt_type) {
                dev_err(cap->rkisp1->dev,
                        "format type mismatch in link '%s:%d->%s:%d'\n",
                        link->source->entity->name, link->source->index,