Commit 69a4237a authored by Yongqiang Niu's avatar Yongqiang Niu Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Separate gamma module 



mt8183 gamma module will different with mt8173,
so separate gamma for adding private data.

Signed-off-by: default avatarYongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: default avatarHsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent a6b7c98a

drivers/gpu/drm/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



mediatek-drm-y := mtk_disp_color.o \

		  mtk_disp_gamma.o \

		  mtk_disp_ovl.o \

		  mtk_disp_rdma.o \

		  mtk_drm_crtc.o \

drivers/gpu/drm/mediatek/mtk_disp_drv.h

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ void mtk_dpi_stop(struct device *dev); 
void mtk_dsi_ddp_start(struct device *dev);

void mtk_dsi_ddp_stop(struct device *dev);



int mtk_gamma_clk_enable(struct device *dev);

void mtk_gamma_clk_disable(struct device *dev);

void mtk_gamma_config(struct device *dev, unsigned int w,

		      unsigned int h, unsigned int vrefresh,

		      unsigned int bpc, struct cmdq_pkt *cmdq_pkt);

void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state);

void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state);

void mtk_gamma_start(struct device *dev);

void mtk_gamma_stop(struct device *dev);



void mtk_ovl_bgclr_in_on(struct device *dev);

void mtk_ovl_bgclr_in_off(struct device *dev);

void mtk_ovl_bypass_shadow(struct device *dev);

drivers/gpu/drm/mediatek/mtk_disp_gamma.c

0 → 100644
+190 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2021 MediaTek Inc.

 */



#include <linux/clk.h>

#include <linux/component.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/of_irq.h>

#include <linux/platform_device.h>

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



#include "mtk_disp_drv.h"

#include "mtk_drm_crtc.h"

#include "mtk_drm_ddp_comp.h"



#define DISP_GAMMA_EN				0x0000

#define GAMMA_EN					BIT(0)

#define DISP_GAMMA_CFG				0x0020

#define GAMMA_LUT_EN					BIT(1)

#define GAMMA_DITHERING					BIT(2)

#define DISP_GAMMA_SIZE				0x0030

#define DISP_GAMMA_LUT				0x0700



#define LUT_10BIT_MASK				0x03ff



struct mtk_disp_gamma_data {

	u32 reserved;

};



/**

 * struct mtk_disp_gamma - DISP_GAMMA driver structure

 * @ddp_comp - structure containing type enum and hardware resources

 * @crtc - associated crtc to report irq events to

 */

struct mtk_disp_gamma {

	struct clk *clk;

	void __iomem *regs;

	struct cmdq_client_reg cmdq_reg;

	const struct mtk_disp_gamma_data *data;

};



int mtk_gamma_clk_enable(struct device *dev)

{

	struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);



	return clk_prepare_enable(gamma->clk);

}



void mtk_gamma_clk_disable(struct device *dev)

{

	struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);



	clk_disable_unprepare(gamma->clk);

}



void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state)

{

	unsigned int i, reg;

	struct drm_color_lut *lut;

	void __iomem *lut_base;

	u32 word;



	if (state->gamma_lut) {

		reg = readl(regs + DISP_GAMMA_CFG);

		reg = reg | GAMMA_LUT_EN;

		writel(reg, regs + DISP_GAMMA_CFG);

		lut_base = regs + DISP_GAMMA_LUT;

		lut = (struct drm_color_lut *)state->gamma_lut->data;

		for (i = 0; i < MTK_LUT_SIZE; i++) {

			word = (((lut[i].red >> 6) & LUT_10BIT_MASK) << 20) +

				(((lut[i].green >> 6) & LUT_10BIT_MASK) << 10) +

				((lut[i].blue >> 6) & LUT_10BIT_MASK);

			writel(word, (lut_base + i * 4));

		}

	}

}



void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)

{

	struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);



	mtk_gamma_set_common(gamma->regs, state);

}



void mtk_gamma_config(struct device *dev, unsigned int w,

		      unsigned int h, unsigned int vrefresh,

		      unsigned int bpc, struct cmdq_pkt *cmdq_pkt)

{

	struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);



	mtk_ddp_write(cmdq_pkt, h << 16 | w, &gamma->cmdq_reg, gamma->regs,

		      DISP_GAMMA_SIZE);

	mtk_dither_set_common(gamma->regs, &gamma->cmdq_reg, bpc, DISP_GAMMA_CFG,

			      GAMMA_DITHERING, cmdq_pkt);

}



void mtk_gamma_start(struct device *dev)

{

	struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);



	writel(GAMMA_EN, gamma->regs + DISP_GAMMA_EN);

}



void mtk_gamma_stop(struct device *dev)

{

	struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);



	writel_relaxed(0x0, gamma->regs + DISP_GAMMA_EN);

}



static int mtk_disp_gamma_bind(struct device *dev, struct device *master,

			       void *data)

{

	return 0;

}



static void mtk_disp_gamma_unbind(struct device *dev, struct device *master,

				  void *data)

{

}



static const struct component_ops mtk_disp_gamma_component_ops = {

	.bind	= mtk_disp_gamma_bind,

	.unbind = mtk_disp_gamma_unbind,

};



static int mtk_disp_gamma_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct mtk_disp_gamma *priv;

	struct resource *res;

	int ret;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk)) {

		dev_err(dev, "failed to get gamma clk\n");

		return PTR_ERR(priv->clk);

	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	priv->regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(priv->regs)) {

		dev_err(dev, "failed to ioremap gamma\n");

		return PTR_ERR(priv->regs);

	}



#if IS_REACHABLE(CONFIG_MTK_CMDQ)

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

	if (ret)

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

#endif



	priv->data = of_device_get_match_data(dev);

	platform_set_drvdata(pdev, priv);



	ret = component_add(dev, &mtk_disp_gamma_component_ops);

	if (ret)

		dev_err(dev, "Failed to add component: %d\n", ret);



	return ret;

}



static int mtk_disp_gamma_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &mtk_disp_gamma_component_ops);



	return 0;

}



static const struct of_device_id mtk_disp_gamma_driver_dt_match[] = {

	{ .compatible = "mediatek,mt8173-disp-gamma"},

	{},

};

MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match);



struct platform_driver mtk_disp_gamma_driver = {

	.probe		= mtk_disp_gamma_probe,

	.remove		= mtk_disp_gamma_remove,

	.driver		= {

		.name	= "mediatek-disp-gamma",

		.owner	= THIS_MODULE,

		.of_match_table = mtk_disp_gamma_driver_dt_match,

	},

};

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c

+11 −60
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ 
#define DITHER_RELAY_MODE			BIT(0)

#define DISP_DITHER_SIZE			0x0030



#define DISP_GAMMA_EN				0x0000

#define DISP_GAMMA_CFG				0x0020

#define DISP_GAMMA_SIZE				0x0030

#define DISP_GAMMA_LUT				0x0700



#define LUT_10BIT_MASK				0x03ff



#define OD_RELAYMODE				BIT(0)
@@ -68,9 +63,6 @@ 


#define AAL_EN					BIT(0)



#define GAMMA_EN				BIT(0)

#define GAMMA_LUT_EN				BIT(1)



#define DISP_DITHERING				BIT(2)

#define DITHER_LSB_ERR_SHIFT_R(x)		(((x) & 0x7) << 28)

#define DITHER_OVFLW_BIT_R(x)			(((x) & 0x7) << 24)
@@ -151,7 +143,6 @@ static void mtk_ddp_clk_disable(struct device *dev) 
	clk_disable_unprepare(priv->clk);

}





void mtk_dither_set_common(void __iomem *regs, struct cmdq_client_reg *cmdq_reg,

			   unsigned int bpc, unsigned int cfg,

			   unsigned int dither_en, struct cmdq_pkt *cmdq_pkt)
@@ -221,6 +212,13 @@ static void mtk_aal_config(struct device *dev, unsigned int w, 
	mtk_ddp_write(cmdq_pkt, w << 16 | h, &priv->cmdq_reg, priv->regs, DISP_AAL_SIZE);

}



static void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



	mtk_gamma_set_common(priv->regs, state);

}



static void mtk_aal_start(struct device *dev)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);
@@ -335,58 +333,10 @@ static void mtk_dither_stop(struct device *dev) 
	writel_relaxed(0x0, priv->regs + DISP_DITHER_EN);

}



static void mtk_gamma_config(struct device *dev, unsigned int w,

			     unsigned int h, unsigned int vrefresh,

			     unsigned int bpc, struct cmdq_pkt *cmdq_pkt)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



	mtk_ddp_write(cmdq_pkt, h << 16 | w, &priv->cmdq_reg, priv->regs, DISP_GAMMA_SIZE);

	mtk_dither_set(dev, bpc, DISP_GAMMA_CFG, cmdq_pkt);

}



static void mtk_gamma_start(struct device *dev)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



	writel(GAMMA_EN, priv->regs  + DISP_GAMMA_EN);

}



static void mtk_gamma_stop(struct device *dev)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);



	writel_relaxed(0x0, priv->regs  + DISP_GAMMA_EN);

}



static void mtk_gamma_set(struct device *dev,

			  struct drm_crtc_state *state)

{

	struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);

	unsigned int i, reg;

	struct drm_color_lut *lut;

	void __iomem *lut_base;

	u32 word;



	if (state->gamma_lut) {

		reg = readl(priv->regs + DISP_GAMMA_CFG);

		reg = reg | GAMMA_LUT_EN;

		writel(reg, priv->regs + DISP_GAMMA_CFG);

		lut_base = priv->regs + DISP_GAMMA_LUT;

		lut = (struct drm_color_lut *)state->gamma_lut->data;

		for (i = 0; i < MTK_LUT_SIZE; i++) {

			word = (((lut[i].red >> 6) & LUT_10BIT_MASK) << 20) +

				(((lut[i].green >> 6) & LUT_10BIT_MASK) << 10) +

				((lut[i].blue >> 6) & LUT_10BIT_MASK);

			writel(word, (lut_base + i * 4));

		}

	}

}



static const struct mtk_ddp_comp_funcs ddp_aal = {

	.clk_enable = mtk_ddp_clk_enable,

	.clk_disable = mtk_ddp_clk_disable,

	.gamma_set = mtk_gamma_set,

	.gamma_set = mtk_aal_gamma_set,

	.config = mtk_aal_config,

	.start = mtk_aal_start,

	.stop = mtk_aal_stop,
@@ -427,8 +377,8 @@ static const struct mtk_ddp_comp_funcs ddp_dsi = { 
};



static const struct mtk_ddp_comp_funcs ddp_gamma = {

	.clk_enable = mtk_ddp_clk_enable,

	.clk_disable = mtk_ddp_clk_disable,

	.clk_enable = mtk_gamma_clk_enable,

	.clk_disable = mtk_gamma_clk_disable,

	.gamma_set = mtk_gamma_set,

	.config = mtk_gamma_config,

	.start = mtk_gamma_start,
@@ -644,6 +594,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp, 


	if (type == MTK_DISP_BLS ||

	    type == MTK_DISP_COLOR ||

	    type == MTK_DISP_GAMMA ||

	    type == MTK_DPI ||

	    type == MTK_DSI ||

	    type == MTK_DISP_OVL ||

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+3 −1
Original line number Diff line number Diff line
@@ -486,11 +486,12 @@ static int mtk_drm_probe(struct platform_device *pdev) 
		private->comp_node[comp_id] = of_node_get(node);



		/*

		 * Currently only the COLOR, OVL, RDMA, DSI, and DPI blocks have

		 * Currently only the COLOR, GAMMA, OVL, RDMA, DSI, and DPI blocks have

		 * separate component platform drivers and initialize their own

		 * DDP component structure. The others are initialized here.

		 */

		if (comp_type == MTK_DISP_COLOR ||

		    comp_type == MTK_DISP_GAMMA ||

		    comp_type == MTK_DISP_OVL ||

		    comp_type == MTK_DISP_OVL_2L ||

		    comp_type == MTK_DISP_RDMA ||
@@ -589,6 +590,7 @@ static struct platform_driver mtk_drm_platform_driver = { 


static struct platform_driver * const mtk_drm_drivers[] = {

	&mtk_disp_color_driver,

	&mtk_disp_gamma_driver,

	&mtk_disp_ovl_driver,

	&mtk_disp_rdma_driver,

	&mtk_dpi_driver,