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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 8B519C433B4 for ; Mon, 17 May 2021 04:35:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 599F5611CC for ; Mon, 17 May 2021 04:35:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232853AbhEQEgv (ORCPT ); Mon, 17 May 2021 00:36:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230148AbhEQEgu (ORCPT ); Mon, 17 May 2021 00:36:50 -0400 Received: from mail-il1-x12f.google.com (mail-il1-x12f.google.com [IPv6:2607:f8b0:4864:20::12f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B11FC06174A for ; Sun, 16 May 2021 21:35:34 -0700 (PDT) Received: by mail-il1-x12f.google.com with SMTP id c16so4959672ilo.1 for ; Sun, 16 May 2021 21:35:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9qPWRHR+PUcFLbaucVvojL1MaT1ICFcyjD+jNvEEGdg=; b=AlTeHTsWilvuYwm9xksxhaCVaXuNSjuJ8FquZYO31IrTM+Y339sDWT8JHoCnXnzIIT AjBipQYY76/Bu+Esgj9jMeOKCiKyqka7FvDAUdvfYW24dhaxjlVdoQiDMrBhXWb2dbwU vskUTHlYPU20jMMANw3Pg1HegjmHdM8pkUezU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9qPWRHR+PUcFLbaucVvojL1MaT1ICFcyjD+jNvEEGdg=; b=izDaDoUchdC13oCbuwhYPZQJYSVvSU21oC3iUp0LkHaoeXRMUV60QDHTB/0hfBrgPp Y0yW8nxhR79HotHe8FM90s/f/gVaQrVG/qXqC8j2pxBgrrFVdr2yMZSdaEAJPx1cFngS zUYkggwg2ljRzk+kn8HWxSptyKAG+ugojSjiN10kmbN0ux6YQT6q4MLBWjirZiY2zQO3 kN6fY8zJcTuxlFEiNx9iOC29ny4pztPAmZswazrXew3wlq26aCFuIhViv+Du9fDtCe0c Xxl3UEWAlC/Udzsf8hWAl3m3aekQ7blKap4O7iPTBDgwHj5oCPmRVIBfiy0TGxdSTbiy eq+w== X-Gm-Message-State: AOAM530X6zfUC1i3vXONJPMLyGXileW2yQRnfGNxTRvntmUp39n5KCEF lRqeppHfcoMemjkyQlpWjhzKnQZ8+9reC+xUSg3SZw== X-Google-Smtp-Source: ABdhPJzoRYq5Zv23D3UkkHYKjX4FehsOCDj3SbfFabhwmX4Id9eUzexY6pzchM5x0sFFg7FADcEPVYyFS/WFm/wJU3s= X-Received: by 2002:a92:360e:: with SMTP id d14mr50144021ila.106.1621226133306; Sun, 16 May 2021 21:35:33 -0700 (PDT) MIME-Version: 1.0 References: <20210427111526.1772293-1-acourbot@chromium.org> <20210427111526.1772293-8-acourbot@chromium.org> In-Reply-To: <20210427111526.1772293-8-acourbot@chromium.org> From: Hsin-Yi Wang Date: Mon, 17 May 2021 12:35:07 +0800 Message-ID: Subject: Re: [PATCH v4 07/15] media: mtk-vcodec: vdec: add media device if using stateless api To: Alexandre Courbot Cc: Tiffany Lin , Andrew-CT Chen , Rob Herring , Yunfei Dong , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, lkml , "moderated list:ARM/Mediatek SoC support" Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Tue, Apr 27, 2021 at 7:16 PM Alexandre Courbot wrote: > > From: Yunfei Dong > > The stateless API requires a media device for issuing requests. Add one > if we are being instantiated as a stateless decoder. > > Signed-off-by: Yunfei Dong > [acourbot: refactor, cleanup and split] > Co-developed-by: Alexandre Courbot > Signed-off-by: Alexandre Courbot > --- > drivers/media/platform/Kconfig | 1 + > .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 39 +++++++++++++++++++ > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 2 + > 3 files changed, 42 insertions(+) > > diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig > index ae1468aa1b4e..4154fdec2efb 100644 > --- a/drivers/media/platform/Kconfig > +++ b/drivers/media/platform/Kconfig > @@ -315,6 +315,7 @@ config VIDEO_MEDIATEK_VCODEC > select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU > select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP > select V4L2_H264 > + select MEDIA_CONTROLLER Should this also select MEDIA_CONTROLLER_REQUEST_API config? Thanks > help > Mediatek video codec driver provides HW capability to > encode and decode in a range of video formats on MT8173 > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > index 533781d4680a..e942e28f96fe 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > > #include "mtk_vcodec_drv.h" > #include "mtk_vcodec_dec.h" > @@ -324,6 +325,31 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > goto err_event_workq; > } > > + if (dev->vdec_pdata->uses_stateless_api) { > + dev->mdev_dec.dev = &pdev->dev; > + strscpy(dev->mdev_dec.model, MTK_VCODEC_DEC_NAME, > + sizeof(dev->mdev_dec.model)); > + > + media_device_init(&dev->mdev_dec); > + dev->mdev_dec.ops = &mtk_vcodec_media_ops; > + dev->v4l2_dev.mdev = &dev->mdev_dec; > + > + ret = v4l2_m2m_register_media_controller(dev->m2m_dev_dec, > + dev->vfd_dec, MEDIA_ENT_F_PROC_VIDEO_DECODER); > + if (ret) { > + mtk_v4l2_err("Failed to register media controller"); > + goto err_reg_cont; > + } > + > + ret = media_device_register(&dev->mdev_dec); > + if (ret) { > + mtk_v4l2_err("Failed to register media device"); > + goto err_media_reg; > + } > + > + mtk_v4l2_debug(0, "media registered as /dev/media%d", > + vfd_dec->num); > + } > ret = video_register_device(vfd_dec, VFL_TYPE_VIDEO, 0); > if (ret) { > mtk_v4l2_err("Failed to register video device"); > @@ -336,6 +362,12 @@ static int mtk_vcodec_probe(struct platform_device *pdev) > return 0; > > err_dec_reg: > + if (dev->vdec_pdata->uses_stateless_api) > + media_device_unregister(&dev->mdev_dec); > +err_media_reg: > + if (dev->vdec_pdata->uses_stateless_api) > + v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec); > +err_reg_cont: > destroy_workqueue(dev->decode_workqueue); > err_event_workq: > v4l2_m2m_release(dev->m2m_dev_dec); > @@ -368,6 +400,13 @@ static int mtk_vcodec_dec_remove(struct platform_device *pdev) > > flush_workqueue(dev->decode_workqueue); > destroy_workqueue(dev->decode_workqueue); > + > + if (media_devnode_is_registered(dev->mdev_dec.devnode)) { > + media_device_unregister(&dev->mdev_dec); > + v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec); > + media_device_cleanup(&dev->mdev_dec); > + } > + > if (dev->m2m_dev_dec) > v4l2_m2m_release(dev->m2m_dev_dec); > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > index 78d4a7728ddf..10edd238c939 100644 > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > @@ -383,6 +383,7 @@ struct mtk_vcodec_enc_pdata { > * struct mtk_vcodec_dev - driver data > * @v4l2_dev: V4L2 device to register video devices for. > * @vfd_dec: Video device for decoder > + * @mdev_dec: Media device for decoder > * @vfd_enc: Video device for encoder. > * > * @m2m_dev_dec: m2m device for decoder > @@ -418,6 +419,7 @@ struct mtk_vcodec_enc_pdata { > struct mtk_vcodec_dev { > struct v4l2_device v4l2_dev; > struct video_device *vfd_dec; > + struct media_device mdev_dec; > struct video_device *vfd_enc; > > struct v4l2_m2m_dev *m2m_dev_dec; > -- > 2.31.1.498.g6c1eba8ee3d-goog > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek