From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EA82C169C4 for ; Mon, 11 Feb 2019 08:31:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FABF20863 for ; Mon, 11 Feb 2019 08:31:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727084AbfBKIbH (ORCPT ); Mon, 11 Feb 2019 03:31:07 -0500 Received: from lb3-smtp-cloud9.xs4all.net ([194.109.24.30]:38957 "EHLO lb3-smtp-cloud9.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726025AbfBKIbH (ORCPT ); Mon, 11 Feb 2019 03:31:07 -0500 Received: from [192.168.2.10] ([212.251.195.8]) by smtp-cloud9.xs4all.net with ESMTPA id t6zVgrCvjRO5Zt6zYg2mHf; Mon, 11 Feb 2019 09:31:04 +0100 Subject: Re: [PATCH 4/9] media: vicodec: add struct for encoder/decoder instance To: Dafna Hirschfeld , linux-media@vger.kernel.org Cc: helen.koike@collabora.com References: <20190209135427.20630-1-dafna3@gmail.com> <20190209135427.20630-5-dafna3@gmail.com> From: Hans Verkuil Message-ID: <892a180f-4663-21cb-729c-7de28ac13e1c@xs4all.nl> Date: Mon, 11 Feb 2019 09:31:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20190209135427.20630-5-dafna3@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4wfCpV1Q65GRsRmfFl4E/luPkmA9onoyVRW/diN6k5CqpKsYZz4Zel6bcg/m2BnHSIdodQRhQwkDZWWPOn1DmdZt86/62khtQJkU+ZvuC5/RAb8WPVzFUk HwQzrYkpHVnK6UM/6CuMgZHoLYrZF3VMospsqCeBDI7duJNACPNc3Fyem0d7jpaWZIGvFsZmjP6rfEaSiiKXfD2oedxv9KY5xtOGYZ90HKAXohHH2jguVIBy dONJqPfTQ/a9KhDxvKY2hg== Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On 2/9/19 2:54 PM, Dafna Hirschfeld wrote: > Add struct 'vicodec_dev_instance' for the fields in vicodec_dev > that have have both decoder and encoder versions. > > Signed-off-by: Dafna Hirschfeld > --- > drivers/media/platform/vicodec/vicodec-core.c | 194 +++++++++--------- > 1 file changed, 92 insertions(+), 102 deletions(-) > > diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c > index 335a931fdf02..e5987229c5a3 100644 > --- 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 { > @@ -312,9 +312,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) > @@ -1457,9 +1457,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; > @@ -1547,7 +1546,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)); > @@ -1595,13 +1594,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)) { > @@ -1659,19 +1658,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; > @@ -1685,100 +1722,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, > + "videdev-enc", true)) I'd rename videdev-enc to "stateful-encoder". > 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, > + "videdev-statefull-dec", false)) And this to "stateful-decoder". > + 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); > > @@ -1793,15 +1783,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; > Regards, Hans