Commit f22a565d authored by CK Hu's avatar CK Hu Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Use struct cmdq_client_reg to gather cmdq variable 



struct cmdq_client_reg include subsys and offset, so use it to replace
these two variable.

Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 993fd584

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+7 −19
Original line number Diff line number Diff line
@@ -96,8 +96,8 @@ void mtk_ddp_write(struct cmdq_pkt *cmdq_pkt, unsigned int value, 
{

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	if (cmdq_pkt)

		cmdq_pkt_write(cmdq_pkt, comp->subsys,

			       comp->regs_pa + offset, value);

		cmdq_pkt_write(cmdq_pkt, comp->cmdq_reg.subsys,

			       comp->cmdq_reg.offset + offset, value);

	else

#endif

		writel(value, regs + offset);
@@ -109,8 +109,8 @@ void mtk_ddp_write_relaxed(struct cmdq_pkt *cmdq_pkt, unsigned int value, 
{

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	if (cmdq_pkt)

		cmdq_pkt_write(cmdq_pkt, comp->subsys,

			       comp->regs_pa + offset, value);

		cmdq_pkt_write(cmdq_pkt, comp->cmdq_reg.subsys,

			       comp->cmdq_reg.offset + offset, value);

	else

#endif

		writel_relaxed(value, regs + offset);
@@ -122,8 +122,8 @@ void mtk_ddp_write_mask(struct cmdq_pkt *cmdq_pkt, unsigned int value, 
{

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	if (cmdq_pkt) {

		cmdq_pkt_write_mask(cmdq_pkt, comp->subsys,

				    comp->regs_pa + offset, value, mask);

		cmdq_pkt_write_mask(cmdq_pkt, comp->cmdq_reg.subsys,

				    comp->cmdq_reg.offset + offset, value, mask);

	} else {

#endif

		u32 tmp = readl(regs + offset);
@@ -558,10 +558,6 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, 
	struct platform_device *comp_pdev;

	enum mtk_ddp_comp_type type;

	struct mtk_ddp_comp_dev *priv;

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	struct resource res;

	struct cmdq_client_reg cmdq_reg;

#endif

	int ret;



	if (comp_id < 0 || comp_id >= DDP_COMPONENT_ID_MAX)
@@ -591,17 +587,9 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, 
	comp->dev = &comp_pdev->dev;



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	if (of_address_to_resource(node, 0, &res) != 0) {

		dev_err(comp->dev, "Missing reg in %s node\n", node->full_name);

		return -EINVAL;

	}

	comp->regs_pa = res.start;



	ret = cmdq_dev_get_client_reg(comp->dev, &cmdq_reg, 0);

	ret = cmdq_dev_get_client_reg(comp->dev, &comp->cmdq_reg, 0);

	if (ret)

		dev_dbg(comp->dev, "get mediatek,gce-client-reg fail!\n");

	else

		comp->subsys = cmdq_reg.subsys;

#endif



	/* Only DMA capable components need the LARB property */

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h

+2 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define MTK_DRM_DDP_COMP_H



#include <linux/io.h>

#include <linux/soc/mediatek/mtk-cmdq.h>

#include <linux/soc/mediatek/mtk-mmsys.h>



struct device;
@@ -70,8 +71,7 @@ struct mtk_ddp_comp { 
	struct device *larb_dev;

	enum mtk_ddp_comp_id id;

	const struct mtk_ddp_comp_funcs *funcs;

	resource_size_t regs_pa;

	u8 subsys;

	struct cmdq_client_reg cmdq_reg;

};



static inline int mtk_ddp_comp_clk_enable(struct mtk_ddp_comp *comp)