From nobody Sun Sep 22 11:45:04 2024 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4B80C433FE for ; Mon, 17 Jan 2022 07:07:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237441AbiAQHHn (ORCPT ); Mon, 17 Jan 2022 02:07:43 -0500 Received: from mailgw01.mediatek.com ([60.244.123.138]:35106 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S235180AbiAQHHW (ORCPT ); Mon, 17 Jan 2022 02:07:22 -0500 X-UUID: 99c25ca09bc846c48eaff89a3c478da4-20220117 X-UUID: 99c25ca09bc846c48eaff89a3c478da4-20220117 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1250832469; Mon, 17 Jan 2022 15:07:17 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Mon, 17 Jan 2022 15:07:16 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 17 Jan 2022 15:07:14 +0800 From: Yong Wu To: Matthias Brugger , Hans Verkuil , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , David Airlie , "Mauro Carvalho Chehab" CC: Evan Green , Robin Murphy , Tomasz Figa , Will Deacon , , , , , , , , , Matthias Kaehlcke , , , , , , Daniel Vetter , Chun-Kuang Hu , Philipp Zabel , Tiffany Lin , "Dafna Hirschfeld" , Hsin-Yi Wang , Eizan Miyamoto , , Frank Wunderlich , , , , AngeloGioacchino Del Regno , "Irui Wang" Subject: [PATCH v10 10/13] media: mtk-vcodec: Get rid of mtk_smi_larb_get/put Date: Mon, 17 Jan 2022 15:05:07 +0800 Message-ID: <20220117070510.17642-11-yong.wu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220117070510.17642-1-yong.wu@mediatek.com> References: <20220117070510.17642-1-yong.wu@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" MediaTek IOMMU has already added the device_link between the consumer and smi-larb device. If the vcodec devices 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_drv.c | 2 - .../platform/mtk-vcodec/mtk_vcodec_dec_hw.c | 1 - .../platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 41 +++-------------- .../platform/mtk-vcodec/mtk_vcodec_drv.h | 3 -- .../platform/mtk-vcodec/mtk_vcodec_enc.c | 1 - .../platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 2 - .../platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 45 +++---------------- 7 files changed, 12 insertions(+), 83 deletions(-) diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drive= rs/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index 86b639d82be8..8d11510e441e 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -450,7 +450,6 @@ static int mtk_vcodec_probe(struct platform_device *pde= v) destroy_workqueue(dev->core_workqueue); err_res: pm_runtime_disable(dev->pm.dev); - put_device(dev->pm.larbvdec); err_dec_pm: mtk_vcodec_fw_release(dev->fw_handler); return ret; @@ -494,7 +493,6 @@ static int mtk_vcodec_dec_remove(struct platform_device= *pdev) =20 v4l2_device_unregister(&dev->v4l2_dev); pm_runtime_disable(dev->pm.dev); - put_device(dev->pm.larbvdec); mtk_vcodec_fw_release(dev->fw_handler); return 0; } diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c b/driver= s/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c index 7b5da3e4cac2..8d2a641d92f1 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_hw.c @@ -184,7 +184,6 @@ static int mtk_vdec_hw_probe(struct platform_device *pd= ev) return 0; err: pm_runtime_disable(subdev_dev->pm.dev); - put_device(subdev_dev->pm.larbvdec); return ret; } =20 diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c b/driver= s/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c index 44035a50e335..7e0c2644bf7b 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c @@ -9,7 +9,6 @@ #include #include #include -#include =20 #include "mtk_vcodec_dec_hw.h" #include "mtk_vcodec_dec_pm.h" @@ -17,25 +16,11 @@ =20 int mtk_vcodec_init_dec_clk(struct platform_device *pdev, struct mtk_vcode= c_pm *pm) { - struct device_node *node; - struct platform_device *larb_pdev; struct mtk_vcodec_clk *dec_clk; struct mtk_vcodec_clk_info *clk_info; - int i =3D 0, ret =3D 0; + int i =3D 0, ret; =20 dec_clk =3D &pm->vdec_clk; - node =3D of_parse_phandle(pdev->dev.of_node, "mediatek,larb", 0); - if (!node) { - mtk_v4l2_err("of_parse_phandle mediatek,larb fail!"); - return -1; - } - - larb_pdev =3D of_find_device_by_node(node); - of_node_put(node); - if (WARN_ON(!larb_pdev)) - return -1; - - pm->larbvdec =3D &larb_pdev->dev; pm->dev =3D &pdev->dev; =20 dec_clk->clk_num =3D @@ -44,14 +29,11 @@ int mtk_vcodec_init_dec_clk(struct platform_device *pde= v, struct mtk_vcodec_pm * dec_clk->clk_info =3D devm_kcalloc(&pdev->dev, dec_clk->clk_num, sizeof(*clk_info), GFP_KERNEL); - if (!dec_clk->clk_info) { - ret =3D -ENOMEM; - goto put_device; - } + if (!dec_clk->clk_info) + return -ENOMEM; } else { mtk_v4l2_err("Failed to get vdec clock count"); - ret =3D -EINVAL; - goto put_device; + return -EINVAL; } =20 for (i =3D 0; i < dec_clk->clk_num; i++) { @@ -60,22 +42,18 @@ int mtk_vcodec_init_dec_clk(struct platform_device *pde= v, struct mtk_vcodec_pm * "clock-names", i, &clk_info->clk_name); if (ret) { mtk_v4l2_err("Failed to get clock name id =3D %d", i); - goto put_device; + return ret; } clk_info->vcodec_clk =3D 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 =3D PTR_ERR(clk_info->vcodec_clk); - goto put_device; + return PTR_ERR(clk_info->vcodec_clk); } } =20 return 0; -put_device: - put_device(pm->larbvdec); - return ret; } EXPORT_SYMBOL_GPL(mtk_vcodec_init_dec_clk); =20 @@ -157,13 +135,7 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_dev *vd= ec_dev, int hw_idx) } } =20 - ret =3D mtk_smi_larb_get(pm->larbvdec); - if (ret) { - mtk_v4l2_err("mtk_smi_larb_get larbvdec fail %d", ret); - goto error; - } return; - error: for (i -=3D 1; i >=3D 0; i--) clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk); @@ -191,7 +163,6 @@ void mtk_vcodec_dec_clock_off(struct mtk_vcodec_dev *vd= ec_dev, int hw_idx) } =20 dec_clk =3D &pm->vdec_clk; - mtk_smi_larb_put(pm->larbvdec); for (i =3D dec_clk->clk_num - 1; i >=3D 0; i--) clk_disable_unprepare(dec_clk->clk_info[i].vcodec_clk); } diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/m= edia/platform/mtk-vcodec/mtk_vcodec_drv.h index 94b47b7c912b..813901c4be5e 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h @@ -214,10 +214,7 @@ struct mtk_vcodec_clk { */ struct mtk_vcodec_pm { struct mtk_vcodec_clk vdec_clk; - struct device *larbvdec; - struct mtk_vcodec_clk venc_clk; - struct device *larbvenc; struct device *dev; }; =20 diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/m= edia/platform/mtk-vcodec/mtk_vcodec_enc.c index 7457451ebff0..8998244ea671 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c @@ -8,7 +8,6 @@ #include #include #include -#include #include =20 #include "mtk_vcodec_drv.h" diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c b/drive= rs/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c index fc40a02af942..dbb0134e8cc0 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c @@ -371,7 +371,6 @@ static int mtk_vcodec_probe(struct platform_device *pde= v) v4l2_device_unregister(&dev->v4l2_dev); err_res: pm_runtime_disable(dev->pm.dev); - put_device(dev->pm.larbvenc); err_enc_pm: mtk_vcodec_fw_release(dev->fw_handler); return ret; @@ -461,7 +460,6 @@ static int mtk_vcodec_enc_remove(struct platform_device= *pdev) =20 v4l2_device_unregister(&dev->v4l2_dev); pm_runtime_disable(dev->pm.dev); - put_device(dev->pm.larbvenc); mtk_vcodec_fw_release(dev->fw_handler); return 0; } diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c b/driver= s/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c index 0825c6ec4eb7..7055954eb2af 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c @@ -8,57 +8,35 @@ #include #include #include -#include =20 #include "mtk_vcodec_enc_pm.h" #include "mtk_vcodec_util.h" =20 int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *mtkdev) { - struct device_node *node; struct platform_device *pdev; struct mtk_vcodec_pm *pm; struct mtk_vcodec_clk *enc_clk; struct mtk_vcodec_clk_info *clk_info; - int ret =3D 0, i =3D 0; - struct device *dev; + int ret, i; =20 pdev =3D mtkdev->plat_dev; pm =3D &mtkdev->pm; memset(pm, 0, sizeof(struct mtk_vcodec_pm)); pm->dev =3D &pdev->dev; - dev =3D &pdev->dev; enc_clk =3D &pm->venc_clk; =20 - node =3D of_parse_phandle(dev->of_node, "mediatek,larb", 0); - if (!node) { - mtk_v4l2_err("no mediatek,larb found"); - return -ENODEV; - } - pdev =3D of_find_device_by_node(node); - of_node_put(node); - if (!pdev) { - mtk_v4l2_err("no mediatek,larb device found"); - return -ENODEV; - } - pm->larbvenc =3D &pdev->dev; - pdev =3D mtkdev->plat_dev; - pm->dev =3D &pdev->dev; - enc_clk->clk_num =3D of_property_count_strings(pdev->dev.of_node, "clock-names"); if (enc_clk->clk_num > 0) { enc_clk->clk_info =3D devm_kcalloc(&pdev->dev, enc_clk->clk_num, sizeof(*clk_info), GFP_KERNEL); - if (!enc_clk->clk_info) { - ret =3D -ENOMEM; - goto put_larbvenc; - } + if (!enc_clk->clk_info) + return -ENOMEM; } else { mtk_v4l2_err("Failed to get venc clock count"); - ret =3D -EINVAL; - goto put_larbvenc; + return -EINVAL; } =20 for (i =3D 0; i < enc_clk->clk_num; i++) { @@ -67,23 +45,18 @@ int mtk_vcodec_init_enc_clk(struct mtk_vcodec_dev *mtkd= ev) "clock-names", i, &clk_info->clk_name); if (ret) { mtk_v4l2_err("venc failed to get clk name %d", i); - goto put_larbvenc; + return ret; } clk_info->vcodec_clk =3D devm_clk_get(&pdev->dev, clk_info->clk_name); if (IS_ERR(clk_info->vcodec_clk)) { mtk_v4l2_err("venc devm_clk_get (%d)%s fail", i, clk_info->clk_name); - ret =3D PTR_ERR(clk_info->vcodec_clk); - goto put_larbvenc; + return PTR_ERR(clk_info->vcodec_clk); } } =20 return 0; - -put_larbvenc: - put_device(pm->larbvenc); - return ret; } =20 void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) @@ -100,11 +73,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm) } } =20 - ret =3D mtk_smi_larb_get(pm->larbvenc); - if (ret) { - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret); - goto clkerr; - } return; =20 clkerr: @@ -117,7 +85,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm) struct mtk_vcodec_clk *enc_clk =3D &pm->venc_clk; int i =3D 0; =20 - mtk_smi_larb_put(pm->larbvenc); for (i =3D enc_clk->clk_num - 1; i >=3D 0; i--) clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk); } --=20 2.18.0