Commit 813420eb authored by Jason-JH.Lin's avatar Jason-JH.Lin Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Change mmsys compatible for mt8195 mediatek-drm 



Because compatible of mt8195 is changing from "mediatek,mt8195-mmsys"
to "mediatek,mt8195-vdosys0".

We have to revert the multiple compatible finding function and
add driver data of mt8195 vdosys0 to mediatek-drm and the sub driver.

Signed-off-by: default avatarJason-JH.Lin <jason-jh.lin@mediatek.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/linux-mediatek/patch/20230306080659.15261-2-jason-jh.lin@mediatek.com/


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

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+12 −114
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ 
 * Author: YT SHEN <yt.shen@mediatek.com>

 */



#include <linux/clk.h>

#include <linux/clk-provider.h>

#include <linux/component.h>

#include <linux/iommu.h>

#include <linux/module.h>
@@ -218,13 +216,6 @@ static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { 
	.shadow_register = true,

};



static const struct mtk_mmsys_match_data mt2701_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt2701_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt7623_mmsys_driver_data = {

	.main_path = mt7623_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt7623_mtk_ddp_main),
@@ -233,13 +224,6 @@ static const struct mtk_mmsys_driver_data mt7623_mmsys_driver_data = { 
	.shadow_register = true,

};



static const struct mtk_mmsys_match_data mt7623_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt7623_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {

	.main_path = mt2712_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt2712_mtk_ddp_main),
@@ -249,25 +233,11 @@ static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { 
	.third_len = ARRAY_SIZE(mt2712_mtk_ddp_third),

};



static const struct mtk_mmsys_match_data mt2712_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt2712_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt8167_mmsys_driver_data = {

	.main_path = mt8167_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt8167_mtk_ddp_main),

};



static const struct mtk_mmsys_match_data mt8167_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt8167_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {

	.main_path = mt8173_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt8173_mtk_ddp_main),
@@ -275,13 +245,6 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = { 
	.ext_len = ARRAY_SIZE(mt8173_mtk_ddp_ext),

};



static const struct mtk_mmsys_match_data mt8173_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt8173_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {

	.main_path = mt8183_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt8183_mtk_ddp_main),
@@ -289,13 +252,6 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = { 
	.ext_len = ARRAY_SIZE(mt8183_mtk_ddp_ext),

};



static const struct mtk_mmsys_match_data mt8183_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt8183_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {

	.main_path = mt8186_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt8186_mtk_ddp_main),
@@ -303,13 +259,6 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = { 
	.ext_len = ARRAY_SIZE(mt8186_mtk_ddp_ext),

};



static const struct mtk_mmsys_match_data mt8186_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt8186_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = {

	.main_path = mt8192_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt8192_mtk_ddp_main),
@@ -317,31 +266,11 @@ static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = { 
	.ext_len = ARRAY_SIZE(mt8192_mtk_ddp_ext),

};



static const struct mtk_mmsys_match_data mt8192_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt8192_mmsys_driver_data,

	},

};



static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = {

	.io_start = 0x1c01a000,

	.main_path = mt8195_mtk_ddp_main,

	.main_len = ARRAY_SIZE(mt8195_mtk_ddp_main),

};



static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = {

	.io_start = 0x1c100000,

};



static const struct mtk_mmsys_match_data mt8195_mmsys_match_data = {

	.num_drv_data = 1,

	.drv_data = {

		&mt8195_vdosys0_driver_data,

		&mt8195_vdosys1_driver_data,

	},

};



static int mtk_drm_kms_init(struct drm_device *drm)

{

	struct mtk_drm_private *private = drm->dev_private;
@@ -659,53 +588,34 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { 


static const struct of_device_id mtk_drm_of_ids[] = {

	{ .compatible = "mediatek,mt2701-mmsys",

	  .data = &mt2701_mmsys_match_data},

	  .data = &mt2701_mmsys_driver_data},

	{ .compatible = "mediatek,mt7623-mmsys",

	  .data = &mt7623_mmsys_match_data},

	  .data = &mt7623_mmsys_driver_data},

	{ .compatible = "mediatek,mt2712-mmsys",

	  .data = &mt2712_mmsys_match_data},

	  .data = &mt2712_mmsys_driver_data},

	{ .compatible = "mediatek,mt8167-mmsys",

	  .data = &mt8167_mmsys_match_data},

	  .data = &mt8167_mmsys_driver_data},

	{ .compatible = "mediatek,mt8173-mmsys",

	  .data = &mt8173_mmsys_match_data},

	  .data = &mt8173_mmsys_driver_data},

	{ .compatible = "mediatek,mt8183-mmsys",

	  .data = &mt8183_mmsys_match_data},

	  .data = &mt8183_mmsys_driver_data},

	{ .compatible = "mediatek,mt8186-mmsys",

	  .data = &mt8186_mmsys_match_data},

	  .data = &mt8186_mmsys_driver_data},

	{ .compatible = "mediatek,mt8192-mmsys",

	  .data = &mt8192_mmsys_match_data},

	  .data = &mt8192_mmsys_driver_data},

	{ .compatible = "mediatek,mt8195-mmsys",

	  .data = &mt8195_mmsys_match_data},

	  .data = &mt8195_vdosys0_driver_data},

	{ .compatible = "mediatek,mt8195-vdosys0",

	  .data = &mt8195_vdosys0_driver_data},

	{ }

};

MODULE_DEVICE_TABLE(of, mtk_drm_of_ids);



static int mtk_drm_find_match_data(struct device *dev,

				   const struct mtk_mmsys_match_data *match_data)

{

	int i;

	struct platform_device *pdev = of_find_device_by_node(dev->parent->of_node);

	struct resource *res;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "failed to get parent resource\n");

		return -EINVAL;

	}



	for (i = 0; i < match_data->num_drv_data; i++)

		if (match_data->drv_data[i]->io_start == res->start)

			return i;



	return -EINVAL;

}



static int mtk_drm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct device_node *phandle = dev->parent->of_node;

	const struct of_device_id *of_id;

	const struct mtk_mmsys_match_data *match_data;

	struct mtk_drm_private *private;

	struct device_node *node;

	struct component_match *match = NULL;
@@ -726,19 +636,7 @@ static int mtk_drm_probe(struct platform_device *pdev) 
	if (!of_id)

		return -ENODEV;



	match_data = of_id->data;

	if (match_data->num_drv_data > 1) {

		/* This SoC has multiple mmsys channels */

		ret = mtk_drm_find_match_data(dev, match_data);

		if (ret < 0) {

			dev_err(dev, "Couldn't get match driver data\n");

			return ret;

		}

		private->data = match_data->drv_data[ret];

	} else {

		dev_dbg(dev, "Using single mmsys channel\n");

		private->data = match_data->drv_data[0];

	}

	private->data = of_id->data;



	/* Iterate over sibling DISP function blocks */

	for_each_child_of_node(phandle->parent, node) {

drivers/gpu/drm/mediatek/mtk_drm_drv.h

+0 −6
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ struct drm_property; 
struct regmap;



struct mtk_mmsys_driver_data {

	const resource_size_t io_start;

	const enum mtk_ddp_comp_id *main_path;

	unsigned int main_len;

	const enum mtk_ddp_comp_id *ext_path;
@@ -32,11 +31,6 @@ struct mtk_mmsys_driver_data { 
	bool shadow_register;

};



struct mtk_mmsys_match_data {

	unsigned short num_drv_data;

	const struct mtk_mmsys_driver_data *drv_data[];

};



struct mtk_drm_private {

	struct drm_device *drm;

	struct device *dma_dev;