Re: [PATCH v4 07/17] media: mtk-mdp: Get rid of mtk_smi_larb_get/put

[houlong wei <houlong.wei@mediatek.com>]

[-- Attachment #1.1: Type: text/plain, Size: 4530 bytes --]

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 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 | 44 +--------------------------
>  drivers/media/platform/mtk-mdp/mtk_mdp_comp.h |  2 --
>  drivers/media/platform/mtk-mdp/mtk_mdp_core.c |  1 -
>  3 files changed, 1 insertion(+), 46 deletions(-)
> 
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> index 228c58f..388ae67 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.c
> @@ -13,7 +13,6 @@
>  #include <linux/of.h>
>  #include <linux/of_irq.h>
>  #include <linux/of_platform.h>
> -#include <soc/mediatek/smi.h>
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
>  
> @@ -58,18 +57,6 @@ void mtk_mdp_comp_clock_on(struct mtk_mdp_comp *comp)
>  {
>  	int i, err;
>  
> -	if (comp->larb_dev) {
> -		err = mtk_smi_larb_get(comp->larb_dev);
> -		if (err) {
> -			enum mtk_mdp_comp_type comp_type =
> -				(enum mtk_mdp_comp_type)
> -				of_device_get_match_data(comp->dev);
> -			dev_err(comp->dev,
> -				"failed to get larb, err %d. type:%d\n",
> -				err, comp_type);
> -		}
> -	}
> -
>  	err = pm_runtime_get_sync(comp->dev);
>  	if (err < 0)
>  		dev_err(comp->dev,
> @@ -97,9 +84,6 @@ void mtk_mdp_comp_clock_off(struct mtk_mdp_comp *comp)
>  		clk_disable_unprepare(comp->clk[i]);
>  	}
>  
> -	if (comp->larb_dev)
> -		mtk_smi_larb_put(comp->larb_dev);
> -
>  	pm_runtime_put_sync(comp->dev);
>  }
>  
> @@ -132,12 +116,10 @@ static void mtk_mdp_comp_unbind(struct device *dev, struct device *master,
>  
>  int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev)
>  {
> -	struct device_node *larb_node;
> -	struct platform_device *larb_pdev;
> -	int i;
>  	struct device_node *node = dev->of_node;
>  	enum mtk_mdp_comp_type comp_type =
>  		 (enum mtk_mdp_comp_type)of_device_get_match_data(dev);
> +	int i;
>  
>  	INIT_LIST_HEAD(&comp->node);
>  	comp->dev = dev;
> @@ -156,30 +138,6 @@ int mtk_mdp_comp_init(struct mtk_mdp_comp *comp, struct device *dev)
>  			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);
> -		return -EINVAL;
> -	}
> -
> -	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);
> -		return -EPROBE_DEFER;
> -	}
> -	of_node_put(larb_node);
> -
> -	comp->larb_dev = &larb_pdev->dev;
> -
>  	return 0;
>  }
>  
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> index de158d3..355e226 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_comp.h
> @@ -11,13 +11,11 @@
>   * struct mtk_mdp_comp - the MDP's function component data
>   * @node:	list node to track sibing MDP components
>   * @clk:	clocks required for component
> - * @larb_dev:	SMI device required for component
>   * @dev:	component's device
>   */
>  struct mtk_mdp_comp {
>  	struct list_head	node;
>  	struct clk		*clk[2];
> -	struct device		*larb_dev;
>  	struct device		*dev;
>  };
>  
> diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> index 133d107..bc5472d 100644
> --- a/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_core.c
> @@ -18,7 +18,6 @@
>  #include <linux/platform_device.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/workqueue.h>
> -#include <soc/mediatek/smi.h>
>  
>  #include "mtk_mdp_comp.h"
>  #include "mtk_mdp_core.h"


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


[-- Attachment #1.2: Type: text/html, Size: 5018 bytes --]

[-- Attachment #2: Type: text/plain, Size: 156 bytes --]

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu