Re: [PATCH v5 08/16] media: mtk-mdp: Get rid of mtk_smi_larb_get/put

houlong wei
2021-06-08T09:51:22Z

On Sat, 2021-04-10 at 17:11 +0800, Yong Wu wrote:
> MediaTek IOMMU has already added the device_link between the consumer
> and smi-larb device. If the mdp device call the pm_runtime_get_sync,
> the smi-larb's pm_runtime_get_sync also be called automatically.
>
> CC: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
> CC: Houlong Wei <houlong.wei@mediatek.com>
> Signed-off-by: Yong Wu <yong.wu@mediatek.com>
> Reviewed-by: Evan Green <evgreen@chromium.org>
> ---
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 40 -------------------
> drivers/media/platform/mtk-mdp/mtk_mdp_comp.h | 2 -
> drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 1 -
> 3 files changed, 43 deletions(-)
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> index b3426a551bea..1e3833f1c9ae 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> @@ -9,7 +9,6 @@
> #include <linux/of.h>
> #include <linux/of_address.h>
> #include <linux/of_platform.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_mdp_comp.h"
>
> @@ -18,14 +17,6 @@ void mtk_mdp_comp_clock_on(struct device *dev, struct mtk_mdp_comp *comp)
> {
> int i, err;
>
> - if (comp->larb_dev) {
> - err = mtk_smi_larb_get(comp->larb_dev);
> - if (err)
> - dev_err(dev,
> - "failed to get larb, err %d. type:%d\n",
> - err, comp->type);
> - }
> -
> for (i = 0; i < ARRAY_SIZE(comp->clk); i++) {
> if (IS_ERR(comp->clk[i]))
> continue;
> @@ -46,17 +37,12 @@ void mtk_mdp_comp_clock_off(struct device *dev, struct mtk_mdp_comp *comp)
> continue;
> clk_disable_unprepare(comp->clk[i]);
> }
> -
> - if (comp->larb_dev)
> - mtk_smi_larb_put(comp->larb_dev);
> }
>
> int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
> struct mtk_mdp_comp *comp,
> enum mtk_mdp_comp_type comp_type)
> {
> - struct device_node *larb_node;
> - struct platform_device *larb_pdev;
> int ret;
> int i;
>
> @@ -77,32 +63,6 @@ int mtk_mdp_comp_init(struct device *dev, struct device_node *node,
> break;
> }
>
> - /* Only DMA capable components need the LARB property */
> - comp->larb_dev = NULL;
> - if (comp->type != MTK_MDP_RDMA &&
> - comp->type != MTK_MDP_WDMA &&
> - comp->type != MTK_MDP_WROT)
> - return 0;
> -
> - larb_node = of_parse_phandle(node, "mediatek,larb", 0);
> - if (!larb_node) {
> - dev_err(dev,
> - "Missing mediadek,larb phandle in %pOF node\n", node);
> - ret = -EINVAL;
> - goto put_dev;
> - }
> -
> - larb_pdev = of_find_device_by_node(larb_node);
> - if (!larb_pdev) {
> - dev_warn(dev, "Waiting for larb device %pOF\n", larb_node);
> - of_node_put(larb_node);
> - ret = -EPROBE_DEFER;
> - goto put_dev;
> - }
> - of_node_put(larb_node);
> -
> - comp->larb_dev = &larb_pdev->dev;
> -
> return 0;
>
> put_dev:
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> index 1bf0242cce46..36bc1b8f6222 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> @@ -27,14 +27,12 @@ enum mtk_mdp_comp_type {
> * @node: list node to track sibing MDP components
> * @dev_node: component device node
> * @clk: clocks required for component
> - * @larb_dev: SMI device required for component
> * @type: component type
> */
> struct mtk_mdp_comp {
> struct list_head node;
> struct device_node *dev_node;
> struct clk *clk[2];
> - struct device *larb_dev;
> enum mtk_mdp_comp_type type;
> };
>
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> index 976aa1f4829b..70a8eab16863 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> @@ -17,7 +17,6 @@
> #include <linux/platform_device.h>
> #include <linux/pm_runtime.h>
> #include <linux/workqueue.h>
> -#include <soc/mediatek/smi.h>
>
> #include "mtk_mdp_core.h"
> #include "mtk_mdp_m2m.h"

Reviewed-by: Houlong Wei <houlong.wei@mediatek.com>