media: staging: rkisp1: isp: set metadata pads to MEDIA_BUS_FMT_METADATA_FIXED

Set the code of the metadata pads of the isp entity to
MEDIA_BUS_FMT_METADATA_FIXED and set the width and
height of their formats to 0. This solves the TODO
item:
"Fix pad format size for statistics and parameters entities."

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/TODO b/drivers/staging/media/rkisp1/TODO
index 75aae98242d09e9e27951819a92c9898021d6111..ca3651fd083337e16ad4d19f133ddd281a74eaf0 100644 (file)
--- a/drivers/staging/media/rkisp1/TODO
+++ b/drivers/staging/media/rkisp1/TODO
@@ -1,4 +1,3 @@
-* Fix pad format size for statistics and parameters entities.
 * Fix checkpatch errors.
 
 NOTES:

diff --git a/drivers/staging/media/rkisp1/rkisp1-isp.c b/drivers/staging/media/rkisp1/rkisp1-isp.c
index a9715b0b7264764f11f8f9f6d23d9d420c4830b3..48d08ff87da2da89f6fdb931c40c2db2b71a02df 100644 (file)
--- a/drivers/staging/media/rkisp1/rkisp1-isp.c
+++ b/drivers/staging/media/rkisp1/rkisp1-isp.c
@@ -574,7 +574,7 @@ static int rkisp1_isp_enum_mbus_code(struct v4l2_subdev *sd,
        } else {
                if (code->index > 0)
                        return -EINVAL;
-               code->code = MEDIA_BUS_FMT_FIXED;
+               code->code = MEDIA_BUS_FMT_METADATA_FIXED;
                return 0;
        }
 
@@ -633,10 +633,10 @@ static int rkisp1_isp_init_config(struct v4l2_subdev *sd,
                                              RKISP1_ISP_PAD_SINK_PARAMS);
        src_fmt = v4l2_subdev_get_try_format(sd, cfg,
                                             RKISP1_ISP_PAD_SOURCE_STATS);
-       sink_fmt->width = RKISP1_DEFAULT_WIDTH;
-       sink_fmt->height = RKISP1_DEFAULT_HEIGHT;
+       sink_fmt->width = 0;
+       sink_fmt->height = 0;
        sink_fmt->field = V4L2_FIELD_NONE;
-       sink_fmt->code = MEDIA_BUS_FMT_FIXED;
+       sink_fmt->code = MEDIA_BUS_FMT_METADATA_FIXED;
        *src_fmt = *sink_fmt;
 
        return 0;