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 60BBBC4332F for ; Thu, 30 Sep 2021 10:58:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4686060F57 for ; Thu, 30 Sep 2021 10:58:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350220AbhI3K7q (ORCPT ); Thu, 30 Sep 2021 06:59:46 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:60238 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350204AbhI3K7p (ORCPT ); Thu, 30 Sep 2021 06:59:45 -0400 Received: from [IPv6:2a02:810a:880:f54:fd5c:7cb1:aaa8:78b1] (unknown [IPv6:2a02:810a:880:f54:fd5c:7cb1:aaa8:78b1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dafna) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id ED32C1F44A9D; Thu, 30 Sep 2021 11:58:00 +0100 (BST) Subject: Re: [PATCH v8 09/12] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put To: Yong Wu , Matthias Brugger , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , David Airlie , Mauro Carvalho Chehab Cc: Evan Green , Robin Murphy , Tomasz Figa , Will Deacon , linux-mediatek@lists.infradead.org, srv_heupstream@mediatek.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, youlin.pei@mediatek.com, Matthias Kaehlcke , anan.sun@mediatek.com, yi.kuo@mediatek.com, acourbot@chromium.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter , Chun-Kuang Hu , Philipp Zabel , Tiffany Lin , Hsin-Yi Wang , Eizan Miyamoto , anthony.huang@mediatek.com, Frank Wunderlich , Irui Wang References: <20210929013719.25120-1-yong.wu@mediatek.com> <20210929013719.25120-10-yong.wu@mediatek.com> <02f444d5-9633-3f9c-2d1f-97ce073d1180@collabora.com> <79cbf64491273797f218f417234b8c95936bd3b1.camel@mediatek.com> From: Dafna Hirschfeld Message-ID: Date: Thu, 30 Sep 2021 12:57:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 MIME-Version: 1.0 In-Reply-To: <79cbf64491273797f218f417234b8c95936bd3b1.camel@mediatek.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 30.09.21 05:28, Yong Wu wrote: > Hi Dafna, > > Thanks very much for the review. > > On Wed, 2021-09-29 at 14:13 +0200, Dafna Hirschfeld wrote: >> >> On 29.09.21 03:37, Yong Wu wrote: >>> MediaTek IOMMU has already added the device_link between the >>> consumer >>> and smi-larb device. If the vcodec device call the >>> pm_runtime_get_sync, >>> the smi-larb's pm_runtime_get_sync also be called automatically. >>> >>> CC: Tiffany Lin >>> CC: Irui Wang >>> Signed-off-by: Yong Wu >>> Reviewed-by: Evan Green >>> Acked-by: Tiffany Lin >>> Reviewed-by: Dafna Hirschfeld >>> --- >>> .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 37 +++----------- >>> -- >>> .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 -- >>> .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 - >>> .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 44 +++----------- >>> ----- >>> 4 files changed, 10 insertions(+), 75 deletions(-) >>> >>> 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..d0bf9aa3b29d 100644 >>> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c >>> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c >>> @@ -8,14 +8,12 @@ >>> #include >>> #include >>> #include >>> -#include >>> >>> #include "mtk_vcodec_dec_pm.h" >>> #include "mtk_vcodec_util.h" >>> >>> int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev *mtkdev) >>> { >>> - struct device_node *node; >>> struct platform_device *pdev; >>> struct mtk_vcodec_pm *pm; >>> struct mtk_vcodec_clk *dec_clk; >>> @@ -26,18 +24,7 @@ int mtk_vcodec_init_dec_pm(struct mtk_vcodec_dev >>> *mtkdev) >>> pm = &mtkdev->pm; >>> pm->mtkdev = mtkdev; >>> dec_clk = &pm->vdec_clk; >>> - node = of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0); >>> - if (!node) { >>> - mtk_v4l2_err("of_parse_phandle mediatek,larb fail!"); >>> - return -1; >>> - } >>> >>> - pdev = of_find_device_by_node(node); >>> - of_node_put(node); >>> - if (WARN_ON(!pdev)) { >>> - return -1; >>> - } >>> - pm->larbvdec = &pdev->dev; >>> pdev = mtkdev->plat_dev; >>> pm->dev = &pdev->dev; >>> >>> @@ -47,14 +34,11 @@ int mtk_vcodec_init_dec_pm(struct >>> mtk_vcodec_dev *mtkdev) >>> dec_clk->clk_info = devm_kcalloc(&pdev->dev, >>> dec_clk->clk_num, sizeof(*clk_info), >>> GFP_KERNEL); >>> - if (!dec_clk->clk_info) { >>> - ret = -ENOMEM; >>> - goto put_device; >>> - } >>> + if (!dec_clk->clk_info) >>> + return -ENOMEM; >>> } else { >>> mtk_v4l2_err("Failed to get vdec clock count"); >>> - ret = -EINVAL; >>> - goto put_device; >>> + return -EINVAL; >>> } >>> >>> for (i = 0; i < dec_clk->clk_num; i++) { >>> @@ -63,29 +47,24 @@ int mtk_vcodec_init_dec_pm(struct >>> mtk_vcodec_dev *mtkdev) >>> "clock-names", i, &clk_info->clk_name); >>> if (ret) { >>> mtk_v4l2_err("Failed to get clock name id = >>> %d", i); >>> - goto put_device; >>> + return ret; >>> } >>> clk_info->vcodec_clk = devm_clk_get(&pdev->dev, >>> clk_info->clk_name); >>> if (IS_ERR(clk_info->vcodec_clk)) { >>> mtk_v4l2_err("devm_clk_get (%d)%s fail", i, >>> clk_info->clk_name); >>> - ret = PTR_ERR(clk_info->vcodec_clk); >>> - goto put_device; >>> + return PTR_ERR(clk_info->vcodec_clk); >>> } >>> } >>> >>> pm_runtime_enable(&pdev->dev); >>> return 0; >>> -put_device: >>> - put_device(pm->larbvdec); >>> - return ret; >>> } >>> >>> void mtk_vcodec_release_dec_pm(struct mtk_vcodec_dev *dev) >>> { >>> pm_runtime_disable(dev->pm.dev); >>> - put_device(dev->pm.larbvdec); >>> } >> >> Now that functions only do 'pm_runtime_disable(dev->pm.dev);' so it >> will be more >> readable to remove the function mtk_vcodec_release_dec_pm >> and replace with pm_runtime_disable(dev->pm.dev); >> Same for the 'enc' equivalent. > > Make sense. But It may be not proper if using pm_runtime_disable > as the symmetry with mtk_vcodec_init_dec_pm in the mtk_vcodec_probe. > > Maybe we should move pm_runtime_enable out from mtk_vcodec_init_dec_pm > into mtk_vcodec_probe. I could do a new patch for this. Is this ok for > you? yes, there is also asymettry when calling pm_runtime* in general, I see in the decoder it is called from mtk_vcodec_dec_pm.c but in the encoder it is called from mtk_vcodec_enc.c, I think all calls to pm_runtime* should be out of the *_pm.c files since for example 'mtk_vcodec_dec_pw_on' also do just one call to pm_runtime_resume_and_get so this function can also be removed. thanks, Dafna > >> >> Thanks, >> Dafna > > [snip] > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek >