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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF021C433F5 for ; Fri, 29 Oct 2021 03:31:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C4BE60FC1 for ; Fri, 29 Oct 2021 03:31:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8C4BE60FC1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:CC:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=v9hDB+dW0njuJA9v8XySeuNMAMP3o0S0ZRq/GzPpZ2k=; b=eio5z7owgA+0p4 ad7aTrhSH+jnfMX4Adfv5/YhDpzPHztsVWamvSfAqCLsQNLInEcBWrFAZv2tHWEITCzxsbZzvvEC+ q/gsQTG9jzRLnf81bhyXSM2mRQqQ1ZH0e1n8yPg3qinmx1m6/GMN0UARtT8jgJOTLoWFB24mBMNPd L6w5WykzSgV040Bf/U/L57XKjEpL61EjEYgaFjJllUd4qwp9KcZY0BDB6MJ0/J3XaG9O2xeVduVw5 CbBoESyYZfg2NqjkocBq7LaG6zogW6IkqHt0yJjovPs0AgGFkzF0ZFErZt0gEMqmZqSnj032XHbA+ KTwf3PlOvJgmDnM3erag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mgIaV-009e6Z-MU; Fri, 29 Oct 2021 03:29:51 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mgIaS-009e5u-1C; Fri, 29 Oct 2021 03:29:49 +0000 X-UUID: 2d16366c6b04405489e69aec06f5749c-20211028 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=GRAPofEE1i4Ut9H7b86SpQ8uaHtsCBapgHD2WyQaUDw=; b=pGBseJxxc0gHRTEKgtBtSgLKHmIeZcVlAQqxcMt9TmeqnFiiDm2+OGm+cdfrNSteiHLlSaa354b4amHHOmkzUz0i5Mn+8Sx8OFA6Bib9BuE6M4uaEYYmBC5ii4OA0fsELpmOnkUKJJgZFOmty6UYQNTnG/HzmZ0ZqwDMIYfSbwQ=; X-UUID: 2d16366c6b04405489e69aec06f5749c-20211028 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1836608755; Thu, 28 Oct 2021 20:29:40 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 28 Oct 2021 20:29:38 -0700 Received: from mtkmbs10n1.mediatek.inc (172.21.101.34) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Fri, 29 Oct 2021 11:29:37 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkmbs10n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Fri, 29 Oct 2021 11:29:36 +0800 Message-ID: Subject: Re: [PATCH v7, 03/15] media: mtk-vcodec: Refactor vcodec pm interface From: "yunfei.dong@mediatek.com" To: Dafna Hirschfeld , Alexandre Courbot , Hans Verkuil , "Tzung-Bi Shih" , Tiffany Lin , Andrew-CT Chen , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Tomasz Figa CC: Hsin-Yi Wang , Fritz Koenig , Benjamin Gaignard , Daniel Vetter , dri-devel , Irui Wang , , , , , , , , Tzung-Bi Shih Date: Fri, 29 Oct 2021 11:29:35 +0800 In-Reply-To: <6f3e94fe-8e02-e79d-858d-620a057b87f2@collabora.com> References: <20211011070247.792-1-yunfei.dong@mediatek.com> <20211011070247.792-4-yunfei.dong@mediatek.com> <6f3e94fe-8e02-e79d-858d-620a057b87f2@collabora.com> X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211028_202948_124357_0BAC5121 X-CRM114-Status: GOOD ( 29.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Dafna, Thanks for your suggestion. On Thu, 2021-10-14 at 15:44 +0200, Dafna Hirschfeld wrote: > > On 11.10.21 09:02, Yunfei Dong wrote: > > Using the needed param for pm init/release function and remove > > unused > > param mtkdev in 'struct mtk_vcodec_pm'. > > > > I see that there is a lot of code duplication between > mtk_vcodec_release_dec_pm.c and mtk_vcodec_release_enc_pm.c > I think if you bother to factor the decoder you should do the same > factor to the encoder, but actually the much better thing to do > is to unify all code duplication between these two files, just for > example of identical functions: > > mtk_vcodec_enc/dec_clock_on/off > mtk_vcodec_release_enc_pm > mtk_vcodec_init_dec_pm > > In addition, the function mtk_vcodec_dec_pw_on can be remove since it > only calls pm_runtime_resume_and_get. > It would be much better to call pm_runtime_resume_and_get directly > and not hide it in a different function > I will fix it in next patch series. It's not very reasonable in this patch series. > Thanks, > Dafna > Thanks, Yunfei Dong > > Reviewed-by: Tzung-Bi Shih > > Signed-off-by: Yunfei Dong > > --- > > .../platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 6 ++--- > > .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 22 ++++++++---- > > ------- > > .../platform/mtk-vcodec/mtk_vcodec_dec_pm.h | 5 +++-- > > .../platform/mtk-vcodec/mtk_vcodec_drv.h | 1 - > > .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 1 - > > 5 files changed, 15 insertions(+), 20 deletions(-) > > > > 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 8db9cdc66043..dd749d41c75a 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c > > @@ -249,7 +249,7 @@ static int mtk_vcodec_probe(struct > > platform_device *pdev) > > if (IS_ERR(dev->fw_handler)) > > return PTR_ERR(dev->fw_handler); > > > > - ret = mtk_vcodec_init_dec_pm(dev); > > + ret = mtk_vcodec_init_dec_pm(dev->plat_dev, &dev->pm); > > if (ret < 0) { > > dev_err(&pdev->dev, "Failed to get mt vcodec clock > > source"); > > goto err_dec_pm; > > @@ -379,7 +379,7 @@ static int mtk_vcodec_probe(struct > > platform_device *pdev) > > err_dec_alloc: > > v4l2_device_unregister(&dev->v4l2_dev); > > err_res: > > - mtk_vcodec_release_dec_pm(dev); > > + mtk_vcodec_release_dec_pm(&dev->pm); > > err_dec_pm: > > mtk_vcodec_fw_release(dev->fw_handler); > > return ret; > > @@ -422,7 +422,7 @@ static int mtk_vcodec_dec_remove(struct > > platform_device *pdev) > > video_unregister_device(dev->vfd_dec); > > > > v4l2_device_unregister(&dev->v4l2_dev); > > - mtk_vcodec_release_dec_pm(dev); > > + mtk_vcodec_release_dec_pm(&dev->pm); > > mtk_vcodec_fw_release(dev->fw_handler); > > return 0; > > } > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > > index 6038db96f71c..20bd157a855c 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c > > @@ -13,18 +13,15 @@ > > #include "mtk_vcodec_dec_pm.h" > > #include "mtk_vcodec_util.h" > > > > -int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) > > +int mtk_vcodec_init_dec_pm(struct platform_device *pdev, > > + struct mtk_vcodec_pm *pm) > > { > > struct device_node *node; > > - struct platform_device *pdev; > > - struct mtk_vcodec_pm *pm; > > + struct platform_device *larb_pdev; > > struct mtk_vcodec_clk *dec_clk; > > struct mtk_vcodec_clk_info *clk_info; > > int i = 0, ret = 0; > > > > - pdev = mtkdev->plat_dev; > > - pm = &mtkdev->pm; > > - pm->mtkdev = mtkdev; > > dec_clk = &pm->vdec_clk; > > node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0); > > if (!node) { > > @@ -32,13 +29,12 @@ int mtk_vcodec_init_dec_pm(struct > > mtk_vcodec_dev *mtkdev) > > return -1; > > } > > > > - pdev = of_find_device_by_node(node); > > + larb_pdev = of_find_device_by_node(node); > > of_node_put(node); > > - if (WARN_ON(!pdev)) { > > + if (WARN_ON(!larb_pdev)) { > > return -1; > > } > > - pm->larbvdec = &pdev->dev; > > - pdev = mtkdev->plat_dev; > > + pm->larbvdec = &larb_pdev->dev; > > pm->dev = &pdev->dev; > > > > dec_clk->clk_num = > > @@ -82,10 +78,10 @@ int mtk_vcodec_init_dec_pm(struct > > mtk_vcodec_dev *mtkdev) > > return ret; > > } > > > > -void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev) > > +void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm) > > { > > - pm_runtime_disable(dev->pm.dev); > > - put_device(dev->pm.larbvdec); > > + pm_runtime_disable(pm->dev); > > + put_device(pm->larbvdec); > > } > > > > int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm) > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > > index 280aeaefdb65..a3df6aef6cb9 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.h > > @@ -9,8 +9,9 @@ > > > > #include "mtk_vcodec_drv.h" > > > > -int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *dev); > > -void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev); > > +int mtk_vcodec_init_dec_pm(struct platform_device *pdev, > > + struct mtk_vcodec_pm *pm); > > +void mtk_vcodec_release_dec_pm(struct mtk_vcodec_pm *pm); > > > > int mtk_vcodec_dec_pw_on(struct mtk_vcodec_pm *pm); > > void mtk_vcodec_dec_pw_off(struct mtk_vcodec_pm *pm); > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > > index 3b1e5e3a450e..973b0b3649c6 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h > > @@ -195,7 +195,6 @@ struct mtk_vcodec_pm { > > struct mtk_vcodec_clk venc_clk; > > struct device *larbvenc; > > struct device *dev; > > - struct mtk_vcodec_dev *mtkdev; > > }; > > > > /** > > diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > > b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > > index 1b2e4930ed27..0c8c8f86788c 100644 > > --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > > +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c > > @@ -26,7 +26,6 @@ int mtk_vcodec_init_enc_pm(struct mtk_vcodec_dev > > *mtkdev) > > pdev = mtkdev->plat_dev; > > pm = &mtkdev->pm; > > memset(pm, 0, sizeof(struct mtk_vcodec_pm)); > > - pm->mtkdev = mtkdev; > > pm->dev = &pdev->dev; > > dev = &pdev->dev; > > enc_clk = &pm->venc_clk; > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel