media: vicodec: add struct for encoder/decoder instance

Add struct 'vicodec_dev_instance' for the fields in vicodec_dev
that have have both decoder and encoder versions.

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index f68c90f995b9895d50da65f0f489547aa2d973ef..b86985babdb1457e8c6be622a8112e6ccdd08941 100644 (file)
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -89,21 +89,21 @@ enum {
        V4L2_M2M_DST = 1,
 };
 
+struct vicodec_dev_instance {
+       struct video_device     vfd;
+       struct mutex            mutex;
+       spinlock_t              lock;
+       struct v4l2_m2m_dev     *m2m_dev;
+};
+
 struct vicodec_dev {
        struct v4l2_device      v4l2_dev;
-       struct video_device     enc_vfd;
-       struct video_device     dec_vfd;
+       struct vicodec_dev_instance stateful_enc;
+       struct vicodec_dev_instance stateful_dec;
 #ifdef CONFIG_MEDIA_CONTROLLER
        struct media_device     mdev;
 #endif
 
-       struct mutex            enc_mutex;
-       struct mutex            dec_mutex;
-       spinlock_t              enc_lock;
-       spinlock_t              dec_lock;
-
-       struct v4l2_m2m_dev     *enc_dev;
-       struct v4l2_m2m_dev     *dec_dev;
 };
 
 struct vicodec_ctx {
@@ -367,9 +367,9 @@ static void device_run(void *priv)
        spin_unlock(ctx->lock);
 
        if (ctx->is_enc)
-               v4l2_m2m_job_finish(dev->enc_dev, ctx->fh.m2m_ctx);
+               v4l2_m2m_job_finish(dev->stateful_enc.m2m_dev, ctx->fh.m2m_ctx);
        else
-               v4l2_m2m_job_finish(dev->dec_dev, ctx->fh.m2m_ctx);
+               v4l2_m2m_job_finish(dev->stateful_dec.m2m_dev, ctx->fh.m2m_ctx);
 }
 
 static void job_remove_src_buf(struct vicodec_ctx *ctx, u32 state)
@@ -1504,9 +1504,8 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
        src_vq->ops = &vicodec_qops;
        src_vq->mem_ops = &vb2_vmalloc_memops;
        src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
-       src_vq->lock = ctx->is_enc ? &ctx->dev->enc_mutex :
-               &ctx->dev->dec_mutex;
-
+       src_vq->lock = ctx->is_enc ? &ctx->dev->stateful_enc.mutex :
+               &ctx->dev->stateful_dec.mutex;
        ret = vb2_queue_init(src_vq);
        if (ret)
                return ret;
@@ -1594,7 +1593,7 @@ static int vicodec_open(struct file *file)
                goto open_unlock;
        }
 
-       if (vfd == &dev->enc_vfd)
+       if (vfd == &dev->stateful_enc.vfd)
                ctx->is_enc = true;
 
        v4l2_fh_init(&ctx->fh, video_devdata(file));
@@ -1642,13 +1641,13 @@ static int vicodec_open(struct file *file)
        ctx->state.colorspace = V4L2_COLORSPACE_REC709;
 
        if (ctx->is_enc) {
-               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->enc_dev, ctx,
-                                                   &queue_init);
-               ctx->lock = &dev->enc_lock;
+               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->stateful_enc.m2m_dev,
+                                                   ctx, &queue_init);
+               ctx->lock = &dev->stateful_enc.lock;
        } else {
-               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->dec_dev, ctx,
-                                                   &queue_init);
-               ctx->lock = &dev->dec_lock;
+               ctx->fh.m2m_ctx = v4l2_m2m_ctx_init(dev->stateful_dec.m2m_dev,
+                                                   ctx, &queue_init);
+               ctx->lock = &dev->stateful_dec.lock;
        }
 
        if (IS_ERR(ctx->fh.m2m_ctx)) {
@@ -1707,19 +1706,57 @@ static const struct v4l2_m2m_ops m2m_ops = {
        .job_ready      = job_ready,
 };
 
+static int register_instance(struct vicodec_dev *dev,
+                            struct vicodec_dev_instance *dev_instance,
+                            const char *name, bool is_enc)
+{
+       struct video_device *vfd;
+       int ret;
+
+       spin_lock_init(&dev_instance->lock);
+       mutex_init(&dev_instance->mutex);
+       dev_instance->m2m_dev = v4l2_m2m_init(&m2m_ops);
+       if (IS_ERR(dev_instance->m2m_dev)) {
+               v4l2_err(&dev->v4l2_dev, "Failed to init vicodec enc device\n");
+               return PTR_ERR(dev_instance->m2m_dev);
+       }
+
+       dev_instance->vfd = vicodec_videodev;
+       vfd = &dev_instance->vfd;
+       vfd->lock = &dev_instance->mutex;
+       vfd->v4l2_dev = &dev->v4l2_dev;
+       strscpy(vfd->name, name, sizeof(vfd->name));
+       vfd->device_caps = V4L2_CAP_STREAMING |
+               (multiplanar ? V4L2_CAP_VIDEO_M2M_MPLANE : V4L2_CAP_VIDEO_M2M);
+       if (is_enc) {
+               v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
+               v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
+       } else {
+               v4l2_disable_ioctl(vfd, VIDIOC_ENCODER_CMD);
+               v4l2_disable_ioctl(vfd, VIDIOC_TRY_ENCODER_CMD);
+       }
+       video_set_drvdata(vfd, dev);
+
+       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
+       if (ret) {
+               v4l2_err(&dev->v4l2_dev, "Failed to register video device '%s'\n", name);
+               v4l2_m2m_release(dev_instance->m2m_dev);
+               return ret;
+       }
+       v4l2_info(&dev->v4l2_dev, "Device '%s' registered as /dev/video%d\n",
+                 name, vfd->num);
+       return 0;
+}
+
 static int vicodec_probe(struct platform_device *pdev)
 {
        struct vicodec_dev *dev;
-       struct video_device *vfd;
        int ret;
 
        dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
        if (!dev)
                return -ENOMEM;
 
-       spin_lock_init(&dev->enc_lock);
-       spin_lock_init(&dev->dec_lock);
-
        ret = v4l2_device_register(&pdev->dev, &dev->v4l2_dev);
        if (ret)
                return ret;
@@ -1733,100 +1770,53 @@ static int vicodec_probe(struct platform_device *pdev)
        dev->v4l2_dev.mdev = &dev->mdev;
 #endif
 
-       mutex_init(&dev->enc_mutex);
-       mutex_init(&dev->dec_mutex);
-
        platform_set_drvdata(pdev, dev);
 
-       dev->enc_dev = v4l2_m2m_init(&m2m_ops);
-       if (IS_ERR(dev->enc_dev)) {
-               v4l2_err(&dev->v4l2_dev, "Failed to init vicodec device\n");
-               ret = PTR_ERR(dev->enc_dev);
+       if (register_instance(dev, &dev->stateful_enc,
+                             "stateful-encoder", true))
                goto unreg_dev;
-       }
-
-       dev->dec_dev = v4l2_m2m_init(&m2m_ops);
-       if (IS_ERR(dev->dec_dev)) {
-               v4l2_err(&dev->v4l2_dev, "Failed to init vicodec device\n");
-               ret = PTR_ERR(dev->dec_dev);
-               goto err_enc_m2m;
-       }
 
-       dev->enc_vfd = vicodec_videodev;
-       vfd = &dev->enc_vfd;
-       vfd->lock = &dev->enc_mutex;
-       vfd->v4l2_dev = &dev->v4l2_dev;
-       strscpy(vfd->name, "vicodec-enc", sizeof(vfd->name));
-       vfd->device_caps = V4L2_CAP_STREAMING |
-               (multiplanar ? V4L2_CAP_VIDEO_M2M_MPLANE : V4L2_CAP_VIDEO_M2M);
-       v4l2_disable_ioctl(vfd, VIDIOC_DECODER_CMD);
-       v4l2_disable_ioctl(vfd, VIDIOC_TRY_DECODER_CMD);
-       video_set_drvdata(vfd, dev);
-
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
-       if (ret) {
-               v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
-               goto err_dec_m2m;
-       }
-       v4l2_info(&dev->v4l2_dev,
-                       "Device registered as /dev/video%d\n", vfd->num);
-
-       dev->dec_vfd = vicodec_videodev;
-       vfd = &dev->dec_vfd;
-       vfd->lock = &dev->dec_mutex;
-       vfd->v4l2_dev = &dev->v4l2_dev;
-       vfd->device_caps = V4L2_CAP_STREAMING |
-               (multiplanar ? V4L2_CAP_VIDEO_M2M_MPLANE : V4L2_CAP_VIDEO_M2M);
-       strscpy(vfd->name, "vicodec-dec", sizeof(vfd->name));
-       v4l2_disable_ioctl(vfd, VIDIOC_ENCODER_CMD);
-       v4l2_disable_ioctl(vfd, VIDIOC_TRY_ENCODER_CMD);
-       video_set_drvdata(vfd, dev);
-
-       ret = video_register_device(vfd, VFL_TYPE_GRABBER, 0);
-       if (ret) {
-               v4l2_err(&dev->v4l2_dev, "Failed to register video device\n");
-               goto unreg_enc;
-       }
-       v4l2_info(&dev->v4l2_dev,
-                       "Device registered as /dev/video%d\n", vfd->num);
+       if (register_instance(dev, &dev->stateful_dec,
+                             "stateful-decoder", false))
+               goto unreg_sf_enc;
 
 #ifdef CONFIG_MEDIA_CONTROLLER
-       ret = v4l2_m2m_register_media_controller(dev->enc_dev,
-                       &dev->enc_vfd, MEDIA_ENT_F_PROC_VIDEO_ENCODER);
+       ret = v4l2_m2m_register_media_controller(dev->stateful_enc.m2m_dev,
+                                                &dev->stateful_enc.vfd,
+                                                MEDIA_ENT_F_PROC_VIDEO_ENCODER);
        if (ret) {
-               v4l2_err(&dev->v4l2_dev, "Failed to init mem2mem media controller\n");
+               v4l2_err(&dev->v4l2_dev, "Failed to init mem2mem media controller for enc\n");
                goto unreg_m2m;
        }
 
-       ret = v4l2_m2m_register_media_controller(dev->dec_dev,
-                       &dev->dec_vfd, MEDIA_ENT_F_PROC_VIDEO_DECODER);
+       ret = v4l2_m2m_register_media_controller(dev->stateful_dec.m2m_dev,
+                                                &dev->stateful_dec.vfd,
+                                                MEDIA_ENT_F_PROC_VIDEO_DECODER);
        if (ret) {
-               v4l2_err(&dev->v4l2_dev, "Failed to init mem2mem media controller\n");
-               goto unreg_m2m_enc_mc;
+               v4l2_err(&dev->v4l2_dev, "Failed to init mem2mem media controller for dec\n");
+               goto unreg_m2m_sf_enc_mc;
        }
 
        ret = media_device_register(&dev->mdev);
        if (ret) {
                v4l2_err(&dev->v4l2_dev, "Failed to register mem2mem media device\n");
-               goto unreg_m2m_dec_mc;
+               goto unreg_m2m_sf_dec_mc;
        }
 #endif
        return 0;
 
 #ifdef CONFIG_MEDIA_CONTROLLER
-unreg_m2m_dec_mc:
-       v4l2_m2m_unregister_media_controller(dev->dec_dev);
-unreg_m2m_enc_mc:
-       v4l2_m2m_unregister_media_controller(dev->enc_dev);
+unreg_m2m_sf_dec_mc:
+       v4l2_m2m_unregister_media_controller(dev->stateful_dec.m2m_dev);
+unreg_m2m_sf_enc_mc:
+       v4l2_m2m_unregister_media_controller(dev->stateful_enc.m2m_dev);
 unreg_m2m:
-       video_unregister_device(&dev->dec_vfd);
+       video_unregister_device(&dev->stateful_dec.vfd);
+       v4l2_m2m_release(dev->stateful_dec.m2m_dev);
 #endif
-unreg_enc:
-       video_unregister_device(&dev->enc_vfd);
-err_dec_m2m:
-       v4l2_m2m_release(dev->dec_dev);
-err_enc_m2m:
-       v4l2_m2m_release(dev->enc_dev);
+unreg_sf_enc:
+       video_unregister_device(&dev->stateful_enc.vfd);
+       v4l2_m2m_release(dev->stateful_enc.m2m_dev);
 unreg_dev:
        v4l2_device_unregister(&dev->v4l2_dev);
 
@@ -1841,15 +1831,15 @@ static int vicodec_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_MEDIA_CONTROLLER
        media_device_unregister(&dev->mdev);
-       v4l2_m2m_unregister_media_controller(dev->enc_dev);
-       v4l2_m2m_unregister_media_controller(dev->dec_dev);
+       v4l2_m2m_unregister_media_controller(dev->stateful_enc.m2m_dev);
+       v4l2_m2m_unregister_media_controller(dev->stateful_dec.m2m_dev);
        media_device_cleanup(&dev->mdev);
 #endif
 
-       v4l2_m2m_release(dev->enc_dev);
-       v4l2_m2m_release(dev->dec_dev);
-       video_unregister_device(&dev->enc_vfd);
-       video_unregister_device(&dev->dec_vfd);
+       v4l2_m2m_release(dev->stateful_enc.m2m_dev);
+       v4l2_m2m_release(dev->stateful_dec.m2m_dev);
+       video_unregister_device(&dev->stateful_enc.vfd);
+       video_unregister_device(&dev->stateful_dec.vfd);
        v4l2_device_unregister(&dev->v4l2_dev);
 
        return 0;