Commit 15ef04e2 authored by Hsiao Chien Sung's avatar Hsiao Chien Sung Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Add Padding to OVL adaptor 



Add MT8188 Padding to OVL adaptor to probe the driver.

Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarHsiao Chien Sung <shawn.sung@mediatek.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20231214055847.4936-20-shawn.sung@mediatek.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 6613476e

drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c

+26 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ enum mtk_ovl_adaptor_comp_type { 
	OVL_ADAPTOR_TYPE_ETHDR,

	OVL_ADAPTOR_TYPE_MDP_RDMA,

	OVL_ADAPTOR_TYPE_MERGE,

	OVL_ADAPTOR_TYPE_PADDING,

	OVL_ADAPTOR_TYPE_NUM,

};
@@ -47,6 +48,14 @@ enum mtk_ovl_adaptor_comp_id { 
	OVL_ADAPTOR_MERGE1,

	OVL_ADAPTOR_MERGE2,

	OVL_ADAPTOR_MERGE3,

	OVL_ADAPTOR_PADDING0,

	OVL_ADAPTOR_PADDING1,

	OVL_ADAPTOR_PADDING2,

	OVL_ADAPTOR_PADDING3,

	OVL_ADAPTOR_PADDING4,

	OVL_ADAPTOR_PADDING5,

	OVL_ADAPTOR_PADDING6,

	OVL_ADAPTOR_PADDING7,

	OVL_ADAPTOR_ID_MAX

};
@@ -67,6 +76,7 @@ static const char * const private_comp_stem[OVL_ADAPTOR_TYPE_NUM] = { 
	[OVL_ADAPTOR_TYPE_ETHDR]	= "ethdr",

	[OVL_ADAPTOR_TYPE_MDP_RDMA]	= "vdo1-rdma",

	[OVL_ADAPTOR_TYPE_MERGE]	= "merge",

	[OVL_ADAPTOR_TYPE_PADDING]	= "padding",

};



static const struct mtk_ddp_comp_funcs ethdr = {
@@ -81,6 +91,13 @@ static const struct mtk_ddp_comp_funcs merge = { 
	.clk_disable = mtk_merge_clk_disable,

};



static const struct mtk_ddp_comp_funcs padding = {

	.clk_enable = mtk_padding_clk_enable,

	.clk_disable = mtk_padding_clk_disable,

	.start = mtk_padding_start,

	.stop = mtk_padding_stop,

};



static const struct mtk_ddp_comp_funcs rdma = {

	.power_on = mtk_mdp_rdma_power_on,

	.power_off = mtk_mdp_rdma_power_off,
@@ -102,6 +119,14 @@ static const struct ovl_adaptor_comp_match comp_matches[OVL_ADAPTOR_ID_MAX] = { 
	[OVL_ADAPTOR_MERGE1] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE2, 2, &merge },

	[OVL_ADAPTOR_MERGE2] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE3, 3, &merge },

	[OVL_ADAPTOR_MERGE3] = { OVL_ADAPTOR_TYPE_MERGE, DDP_COMPONENT_MERGE4, 4, &merge },

	[OVL_ADAPTOR_PADDING0] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING0, 0, &padding },

	[OVL_ADAPTOR_PADDING1] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING1, 1, &padding },

	[OVL_ADAPTOR_PADDING2] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING2, 2, &padding },

	[OVL_ADAPTOR_PADDING3] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING3, 3, &padding },

	[OVL_ADAPTOR_PADDING4] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING4, 4, &padding },

	[OVL_ADAPTOR_PADDING5] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING5, 5, &padding },

	[OVL_ADAPTOR_PADDING6] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING6, 6, &padding },

	[OVL_ADAPTOR_PADDING7] = { OVL_ADAPTOR_TYPE_PADDING, DDP_COMPONENT_PADDING7, 7, &padding },

};



void mtk_ovl_adaptor_layer_config(struct device *dev, unsigned int idx,
@@ -437,6 +462,7 @@ static int ovl_adaptor_comp_get_id(struct device *dev, struct device_node *node, 
}



static const struct of_device_id mtk_ovl_adaptor_comp_dt_ids[] = {

	{ .compatible = "mediatek,mt8188-disp-padding", .data = (void *)OVL_ADAPTOR_TYPE_PADDING },

	{ .compatible = "mediatek,mt8195-disp-ethdr", .data = (void *)OVL_ADAPTOR_TYPE_ETHDR },

	{ .compatible = "mediatek,mt8195-disp-merge", .data = (void *)OVL_ADAPTOR_TYPE_MERGE },

	{ .compatible = "mediatek,mt8195-vdo1-rdma", .data = (void *)OVL_ADAPTOR_TYPE_MDP_RDMA },