media: cedrus: Remove checking for required controls

commit 7072db89572135f28cad65f15877bf7e67cf2ff8 upstream.

According to v4l2 request api specifications, it's allowed to skip
control if its content isn't changed for performance reasons. Cedrus
driver predates that, so it has implemented mechanism to check if all
required controls are included in one request.

Conform to specifications with removing that mechanism.

Note that this mechanism with static required flag isn't very good
anyway because need for control is usually signaled in other controls.

Fixes: 50e761516f2b ("media: platform: Add Cedrus VPU decoder driver")
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c
index ddad5d274ee81d5154b3e9131a2855a7599f1e3d..7bd9291c8d5f5a2afb7333e087a719cd7d163c32 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -34,56 +34,48 @@ static const struct cedrus_control cedrus_controls[] = {
                        .id     = V4L2_CID_MPEG_VIDEO_MPEG2_SLICE_PARAMS,
                },
                .codec          = CEDRUS_CODEC_MPEG2,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_MPEG_VIDEO_MPEG2_QUANTIZATION,
                },
                .codec          = CEDRUS_CODEC_MPEG2,
-               .required       = false,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_STATELESS_H264_DECODE_PARAMS,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_STATELESS_H264_SLICE_PARAMS,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_STATELESS_H264_SPS,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_STATELESS_H264_PPS,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_STATELESS_H264_SCALING_MATRIX,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = false,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_STATELESS_H264_PRED_WEIGHTS,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = false,
        },
        {
                .cfg = {
@@ -92,7 +84,6 @@ static const struct cedrus_control cedrus_controls[] = {
                        .def    = V4L2_STATELESS_H264_DECODE_MODE_SLICE_BASED,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = false,
        },
        {
                .cfg = {
@@ -101,7 +92,6 @@ static const struct cedrus_control cedrus_controls[] = {
                        .def    = V4L2_STATELESS_H264_START_CODE_NONE,
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = false,
        },
        /*
         * We only expose supported profiles information,
@@ -120,28 +110,24 @@ static const struct cedrus_control cedrus_controls[] = {
                                BIT(V4L2_MPEG_VIDEO_H264_PROFILE_EXTENDED),
                },
                .codec          = CEDRUS_CODEC_H264,
-               .required       = false,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_MPEG_VIDEO_HEVC_SPS,
                },
                .codec          = CEDRUS_CODEC_H265,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_MPEG_VIDEO_HEVC_PPS,
                },
                .codec          = CEDRUS_CODEC_H265,
-               .required       = true,
        },
        {
                .cfg = {
                        .id     = V4L2_CID_MPEG_VIDEO_HEVC_SLICE_PARAMS,
                },
                .codec          = CEDRUS_CODEC_H265,
-               .required       = true,
        },
        {
                .cfg = {
@@ -150,7 +136,6 @@ static const struct cedrus_control cedrus_controls[] = {
                        .def    = V4L2_MPEG_VIDEO_HEVC_DECODE_MODE_SLICE_BASED,
                },
                .codec          = CEDRUS_CODEC_H265,
-               .required       = false,
        },
        {
                .cfg = {
@@ -159,14 +144,12 @@ static const struct cedrus_control cedrus_controls[] = {
                        .def    = V4L2_MPEG_VIDEO_HEVC_START_CODE_NONE,
                },
                .codec          = CEDRUS_CODEC_H265,
-               .required       = false,
        },
        {
                .cfg = {
                        .id             = V4L2_CID_MPEG_VIDEO_VP8_FRAME_HEADER,
                },
                .codec          = CEDRUS_CODEC_VP8,
-               .required       = true,
        },
 };
 
@@ -227,12 +210,8 @@ static int cedrus_init_ctrls(struct cedrus_dev *dev, struct cedrus_ctx *ctx)
 static int cedrus_request_validate(struct media_request *req)
 {
        struct media_request_object *obj;
-       struct v4l2_ctrl_handler *parent_hdl, *hdl;
        struct cedrus_ctx *ctx = NULL;
-       struct v4l2_ctrl *ctrl_test;
        unsigned int count;
-       unsigned int i;
-       int ret = 0;
 
        list_for_each_entry(obj, &req->objects, list) {
                struct vb2_buffer *vb;
@@ -259,34 +238,6 @@ static int cedrus_request_validate(struct media_request *req)
                return -EINVAL;
        }
 
-       parent_hdl = &ctx->hdl;
-
-       hdl = v4l2_ctrl_request_hdl_find(req, parent_hdl);
-       if (!hdl) {
-               v4l2_info(&ctx->dev->v4l2_dev, "Missing codec control(s)\n");
-               return -ENOENT;
-       }
-
-       for (i = 0; i < CEDRUS_CONTROLS_COUNT; i++) {
-               if (cedrus_controls[i].codec != ctx->current_codec ||
-                   !cedrus_controls[i].required)
-                       continue;
-
-               ctrl_test = v4l2_ctrl_request_hdl_ctrl_find(hdl,
-                                                           cedrus_controls[i].cfg.id);
-               if (!ctrl_test) {
-                       v4l2_info(&ctx->dev->v4l2_dev,
-                                 "Missing required codec control\n");
-                       ret = -ENOENT;
-                       break;
-               }
-       }
-
-       v4l2_ctrl_request_hdl_put(hdl);
-
-       if (ret)
-               return ret;
-
        return vb2_request_validate(req);
 }
 

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h
index c96077aaef4930f93d6fda4b35615a1469b06aff..251a6a66035161ef9bc4ffea06e0f5eda9f74d5b 100644 (file)
--- a/drivers/staging/media/sunxi/cedrus/cedrus.h
+++ b/drivers/staging/media/sunxi/cedrus/cedrus.h
@@ -56,7 +56,6 @@ enum cedrus_h264_pic_type {
 struct cedrus_control {
        struct v4l2_ctrl_config cfg;
        enum cedrus_codec       codec;
-       unsigned char           required:1;
 };
 
 struct cedrus_h264_run {