+ Tiffany & Maoguang.
On Sat, 2020-05-30 at 16:10 +0800, 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 <tiffany....@mediatek.com>
> Signed-off-by: Yong Wu <yong...@mediatek.com>
> Reviewed-by: Evan Green <evgr...@chromium.org>
> ---
> .../media/platform/mtk-vcodec/mtk_vcodec_dec_pm.c | 19 ---------------
> drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 3 ---
> drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 1 -
> .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 27
> ----------------------
> 4 files changed, 50 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 36dfe3f..1d7d14d 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 <linux/of_address.h>
> #include <linux/of_platform.h>
> #include <linux/pm_runtime.h>
> -#include <soc/mediatek/smi.h>
>
> #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;
>
> @@ -113,11 +100,6 @@ void mtk_vcodec_dec_clock_on(struct mtk_vcodec_pm *pm)
> }
> }
>
> - ret = mtk_smi_larb_get(pm->larbvdec);
> - if (ret) {
> - mtk_v4l2_err("mtk_smi_larb_get larbvdec fail %d", ret);
> - goto error;
> - }
> return;
>
> error:
> @@ -130,7 +112,6 @@ void mtk_vcodec_dec_clock_off(struct mtk_vcodec_pm *pm)
> struct mtk_vcodec_clk *dec_clk = &pm->vdec_clk;
> int i = 0;
>
> - mtk_smi_larb_put(pm->larbvdec);
> for (i = dec_clk->clk_num - 1; i >= 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/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> index 52d1ce1..7d3966a 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> @@ -190,10 +190,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;
> struct mtk_vcodec_dev *mtkdev;
> };
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
> index 5301dca..18025f7 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 <media/v4l2-event.h>
> #include <media/v4l2-mem2mem.h>
> #include <media/videobuf2-dma-contig.h>
> -#include <soc/mediatek/smi.h>
> #include <linux/pm_runtime.h>
>
> #include "mtk_vcodec_drv.h"
> 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 01c6a55..047919e 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c
> @@ -8,44 +8,25 @@
> #include <linux/of_address.h>
> #include <linux/of_platform.h>
> #include <linux/pm_runtime.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_vcodec_enc_pm.h"
> #include "mtk_vcodec_util.h"
>
> int mtk_vcodec_init_enc_pm(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 = 0, i = 0;
> - struct device *dev;
>
> 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;
>
> - node = of_parse_phandle(dev->of_node, "mediatek,larb", 0);
> - if (!node) {
> - mtk_v4l2_err("no mediatek,larb found");
> - return -ENODEV;
> - }
> - pdev = of_find_device_by_node(node);
> - of_node_put(node);
> - if (!pdev) {
> - mtk_v4l2_err("no mediatek,larb device found");
> - return -ENODEV;
> - }
> - pm->larbvenc = &pdev->dev;
> - pdev = mtkdev->plat_dev;
> - pm->dev = &pdev->dev;
> -
> enc_clk->clk_num = of_property_count_strings(pdev->dev.of_node,
> "clock-names");
> if (enc_clk->clk_num > 0) {
> @@ -93,13 +74,6 @@ void mtk_vcodec_enc_clock_on(struct mtk_vcodec_pm *pm)
> }
> }
>
> - ret = mtk_smi_larb_get(pm->larbvenc);
> - if (ret) {
> - mtk_v4l2_err("mtk_smi_larb_get larb3 fail %d", ret);
> - goto clkerr;
> - }
> - return;
> -
> clkerr:
> for (i -= 1; i >= 0; i--)
> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> @@ -110,7 +84,6 @@ void mtk_vcodec_enc_clock_off(struct mtk_vcodec_pm *pm)
> struct mtk_vcodec_clk *enc_clk = &pm->venc_clk;
> int i = 0;
>
> - mtk_smi_larb_put(pm->larbvenc);
> for (i = enc_clk->clk_num - 1; i >= 0; i--)
> clk_disable_unprepare(enc_clk->clk_info[i].vcodec_clk);
> }
