media: rkvdec: Don't require unneeded H264_SLICE_PARAMS

Now that slice invariant parameters have been moved,
the driver no longer needs this control, so drop it.

Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Jonas Karlman <jonas@kwiboo.se>
Tested-by: Jonas Karlman <jonas@kwiboo.se>
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/rkvdec/rkvdec-h264.c b/drivers/staging/media/rkvdec/rkvdec-h264.c
index 90f2118..c45cd16 100644 (file)
--- a/drivers/staging/media/rkvdec/rkvdec-h264.c
+++ b/drivers/staging/media/rkvdec/rkvdec-h264.c
@@ -109,7 +109,6 @@ struct rkvdec_h264_reflists {
 struct rkvdec_h264_run {
        struct rkvdec_run base;
        const struct v4l2_ctrl_h264_decode_params *decode_params;
-       const struct v4l2_ctrl_h264_slice_params *slices_params;
        const struct v4l2_ctrl_h264_sps *sps;
        const struct v4l2_ctrl_h264_pps *pps;
        const struct v4l2_ctrl_h264_scaling_matrix *scaling_matrix;
@@ -1067,9 +1066,6 @@ static void rkvdec_h264_run_preamble(struct rkvdec_ctx *ctx,
                              V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAMS);
        run->decode_params = ctrl ? ctrl->p_cur.p : NULL;
        ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
-                             V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS);
-       run->slices_params = ctrl ? ctrl->p_cur.p : NULL;
-       ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,
                              V4L2_CID_MPEG_VIDEO_H264_SPS);
        run->sps = ctrl ? ctrl->p_cur.p : NULL;
        ctrl = v4l2_ctrl_find(&ctx->ctrl_hdl,

diff --git a/drivers/staging/media/rkvdec/rkvdec.c b/drivers/staging/media/rkvdec/rkvdec.c
index c815132..7c51295 100644 (file)
--- a/drivers/staging/media/rkvdec/rkvdec.c
+++ b/drivers/staging/media/rkvdec/rkvdec.c
@@ -62,11 +62,6 @@ static const struct rkvdec_ctrl_desc rkvdec_h264_ctrl_descs[] = {
        {
                .per_request = true,
                .mandatory = true,
-               .cfg.id = V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAMS,
-       },
-       {
-               .per_request = true,
-               .mandatory = true,
                .cfg.id = V4L2_CID_MPEG_VIDEO_H264_SPS,
                .cfg.ops = &rkvdec_ctrl_ops,
        },