Commit 682c3cd8 authored by Yong Wu's avatar Yong Wu Committed by Mauro Carvalho Chehab
Browse files

media: mtk-mdp: Get rid of mtk_smi_larb_get/put 



MediaTek IOMMU has already added the device_link between the consumer
and smi-larb device. If the mdp device calls the pm_runtime_get_sync,
the smi-larb's pm_runtime_get_sync also be called automatically.

CC: Minghsiu Tsai <minghsiu.tsai@mediatek.com>
Signed-off-by: default avatarYong Wu <yong.wu@mediatek.com>
Reviewed-by: default avatarEvan Green <evgreen@chromium.org>
Reviewed-by: default avatarHoulong Wei <houlong.wei@mediatek.com>
Reviewed-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent ba3cd671

drivers/media/platform/mtk-mdp/mtk_mdp_comp.c

+0 −40
Original line number Diff line number Diff line
@@ -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:

drivers/media/platform/mtk-mdp/mtk_mdp_comp.h

+0 −2
Original line number Diff line number Diff line
@@ -26,14 +26,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;

};

drivers/media/platform/mtk-mdp/mtk_mdp_core.c

+0 −1
Original line number Diff line number Diff line
@@ -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"