drm/mediatek: add mutex mod into ddp private data (0d3a1202) · Commits · 戴 / test

drivers/gpu/drm/mediatek/mtk_drm_ddp.c

+30 −11

Original line number	Diff line number	Diff line
		@@ -139,12 +139,16 @@ struct mtk_disp_mutex {
		bool claimed;
		};

		struct mtk_ddp_data {
		const unsigned int *mutex_mod;
		};

		struct mtk_ddp {
		struct device *dev;
		struct clk *clk;
		void __iomem *regs;
		struct mtk_disp_mutex mutex[10];
		const unsigned int *mutex_mod;
		const struct mtk_ddp_data *data;
		};

		static const unsigned int mt2701_mutex_mod[DDP_COMPONENT_ID_MAX] = {
		@@ -194,6 +198,18 @@ static const unsigned int mt8173_mutex_mod[DDP_COMPONENT_ID_MAX] = {
		[DDP_COMPONENT_WDMA1] = MT8173_MUTEX_MOD_DISP_WDMA1,
		};

		static const struct mtk_ddp_data mt2701_ddp_driver_data = {
		.mutex_mod = mt2701_mutex_mod,
		};

		static const struct mtk_ddp_data mt2712_ddp_driver_data = {
		.mutex_mod = mt2712_mutex_mod,
		};

		static const struct mtk_ddp_data mt8173_ddp_driver_data = {
		.mutex_mod = mt8173_mutex_mod,
		};

		static unsigned int mtk_ddp_mout_en(enum mtk_ddp_comp_id cur,
		enum mtk_ddp_comp_id next,
		unsigned int *addr)
		@@ -456,15 +472,15 @@ void mtk_disp_mutex_add_comp(struct mtk_disp_mutex *mutex,
		reg = MUTEX_SOF_DPI1;
		break;
		default:
		if (ddp->mutex_mod[id] < 32) {
		if (ddp->data->mutex_mod[id] < 32) {
		offset = DISP_REG_MUTEX_MOD(mutex->id);
		reg = readl_relaxed(ddp->regs + offset);
		reg \|= 1 << ddp->mutex_mod[id];
		reg \|= 1 << ddp->data->mutex_mod[id];
		writel_relaxed(reg, ddp->regs + offset);
		} else {
		offset = DISP_REG_MUTEX_MOD2(mutex->id);
		reg = readl_relaxed(ddp->regs + offset);
		reg \|= 1 << (ddp->mutex_mod[id] - 32);
		reg \|= 1 << (ddp->data->mutex_mod[id] - 32);
		writel_relaxed(reg, ddp->regs + offset);
		}
		return;
		@@ -494,15 +510,15 @@ void mtk_disp_mutex_remove_comp(struct mtk_disp_mutex *mutex,
		ddp->regs + DISP_REG_MUTEX_SOF(mutex->id));
		break;
		default:
		if (ddp->mutex_mod[id] < 32) {
		if (ddp->data->mutex_mod[id] < 32) {
		offset = DISP_REG_MUTEX_MOD(mutex->id);
		reg = readl_relaxed(ddp->regs + offset);
		reg &= ~(1 << ddp->mutex_mod[id]);
		reg &= ~(1 << ddp->data->mutex_mod[id]);
		writel_relaxed(reg, ddp->regs + offset);
		} else {
		offset = DISP_REG_MUTEX_MOD2(mutex->id);
		reg = readl_relaxed(ddp->regs + offset);
		reg &= ~(1 << (ddp->mutex_mod[id] - 32));
		reg &= ~(1 << (ddp->data->mutex_mod[id] - 32));
		writel_relaxed(reg, ddp->regs + offset);
		}
		break;
		@@ -577,7 +593,7 @@ static int mtk_ddp_probe(struct platform_device *pdev)
		return PTR_ERR(ddp->regs);
		}

		ddp->mutex_mod = of_device_get_match_data(dev);
		ddp->data = of_device_get_match_data(dev);

		platform_set_drvdata(pdev, ddp);

		@@ -590,9 +606,12 @@ static int mtk_ddp_remove(struct platform_device *pdev)
		}

		static const struct of_device_id ddp_driver_dt_match[] = {
		{ .compatible = "mediatek,mt2701-disp-mutex", .data = mt2701_mutex_mod},
		{ .compatible = "mediatek,mt2712-disp-mutex", .data = mt2712_mutex_mod},
		{ .compatible = "mediatek,mt8173-disp-mutex", .data = mt8173_mutex_mod},
		{ .compatible = "mediatek,mt2701-disp-mutex",
		.data = &mt2701_ddp_driver_data},
		{ .compatible = "mediatek,mt2712-disp-mutex",
		.data = &mt2712_ddp_driver_data},
		{ .compatible = "mediatek,mt8173-disp-mutex",
		.data = &mt8173_ddp_driver_data},
		{},
		};
		MODULE_DEVICE_TABLE(of, ddp_driver_dt_match);

Admin message