Commit f97a1b65 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-5.15' of... 

Merge tag 'mediatek-drm-next-5.15' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 5.15

1. MT8133 AAL support, adjust rdma fifo threshold formula.
2. Implement mmap as GEM object function.
3. Add support for MT8167.
4. Test component initialization earlier in the function mtk_drm_crtc_create.
5. CMDQ refinement.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210816232427.13368-1-chunkuang.hu@kernel.org
parents 2819cf0e 9efb16c2

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ channel output. 


Required properties:

- compatible: "mediatek,<chip>-dsi"

- the supported chips are mt2701, mt7623, mt8173 and mt8183.

- the supported chips are mt2701, mt7623, mt8167, mt8173 and mt8183.

- reg: Physical base address and length of the controller's registers

- interrupts: The interrupt signal from the function block.

- clocks: device clocks

drivers/gpu/drm/mediatek/Makefile

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



mediatek-drm-y := mtk_disp_ccorr.o \

mediatek-drm-y := mtk_disp_aal.o \

		  mtk_disp_ccorr.o \

		  mtk_disp_color.o \

		  mtk_disp_gamma.o \

		  mtk_disp_ovl.o \

drivers/gpu/drm/mediatek/mtk_disp_aal.c

0 → 100644
+167 −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_AAL_EN				0x0000

#define AAL_EN						BIT(0)

#define DISP_AAL_SIZE				0x0030





struct mtk_disp_aal_data {

	bool has_gamma;

};



/**

 * struct mtk_disp_aal - DISP_AAL driver structure

 * @ddp_comp - structure containing type enum and hardware resources

 * @crtc - associated crtc to report irq events to

 */

struct mtk_disp_aal {

	struct clk *clk;

	void __iomem *regs;

	struct cmdq_client_reg cmdq_reg;

	const struct mtk_disp_aal_data *data;

};



int mtk_aal_clk_enable(struct device *dev)

{

	struct mtk_disp_aal *aal = dev_get_drvdata(dev);



	return clk_prepare_enable(aal->clk);

}



void mtk_aal_clk_disable(struct device *dev)

{

	struct mtk_disp_aal *aal = dev_get_drvdata(dev);



	clk_disable_unprepare(aal->clk);

}



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

			   unsigned int h, unsigned int vrefresh,

			   unsigned int bpc, struct cmdq_pkt *cmdq_pkt)

{

	struct mtk_disp_aal *aal = dev_get_drvdata(dev);



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

}



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

{

	struct mtk_disp_aal *aal = dev_get_drvdata(dev);



	if (aal->data && aal->data->has_gamma)

		mtk_gamma_set_common(aal->regs, state);

}



void mtk_aal_start(struct device *dev)

{

	struct mtk_disp_aal *aal = dev_get_drvdata(dev);



	writel(AAL_EN, aal->regs + DISP_AAL_EN);

}



void mtk_aal_stop(struct device *dev)

{

	struct mtk_disp_aal *aal = dev_get_drvdata(dev);



	writel_relaxed(0x0, aal->regs + DISP_AAL_EN);

}



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

			       void *data)

{

	return 0;

}



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

				  void *data)

{

}



static const struct component_ops mtk_disp_aal_component_ops = {

	.bind	= mtk_disp_aal_bind,

	.unbind = mtk_disp_aal_unbind,

};



static int mtk_disp_aal_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct mtk_disp_aal *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 aal 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 aal\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_aal_component_ops);

	if (ret)

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



	return ret;

}



static int mtk_disp_aal_remove(struct platform_device *pdev)

{

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



	return 0;

}



static const struct mtk_disp_aal_data mt8173_aal_driver_data = {

	.has_gamma = true,

};



static const struct of_device_id mtk_disp_aal_driver_dt_match[] = {

	{ .compatible = "mediatek,mt8173-disp-aal",

	  .data = &mt8173_aal_driver_data},

	{ .compatible = "mediatek,mt8183-disp-aal"},

	{},

};

MODULE_DEVICE_TABLE(of, mtk_disp_aal_driver_dt_match);



struct platform_driver mtk_disp_aal_driver = {

	.probe		= mtk_disp_aal_probe,

	.remove		= mtk_disp_aal_remove,

	.driver		= {

		.name	= "mediatek-disp-aal",

		.owner	= THIS_MODULE,

		.of_match_table = mtk_disp_aal_driver_dt_match,

	},

};

drivers/gpu/drm/mediatek/mtk_disp_drv.h

+9 −0
Original line number Diff line number Diff line
@@ -9,6 +9,15 @@ 
#include <linux/soc/mediatek/mtk-cmdq.h>

#include "mtk_drm_plane.h"



int mtk_aal_clk_enable(struct device *dev);

void mtk_aal_clk_disable(struct device *dev);

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

		    unsigned int h, unsigned int vrefresh,

		    unsigned int bpc, struct cmdq_pkt *cmdq_pkt);

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

void mtk_aal_start(struct device *dev);

void mtk_aal_stop(struct device *dev);



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

int mtk_ccorr_clk_enable(struct device *dev);

void mtk_ccorr_clk_disable(struct device *dev);

drivers/gpu/drm/mediatek/mtk_disp_rdma.c

+3 −3
Original line number Diff line number Diff line
@@ -162,10 +162,10 @@ void mtk_rdma_config(struct device *dev, unsigned int width, 
	/*

	 * Enable FIFO underflow since DSI and DPI can't be blocked.

	 * Keep the FIFO pseudo size reset default of 8 KiB. Set the

	 * output threshold to 6 microseconds with 7/6 overhead to

	 * account for blanking, and with a pixel depth of 4 bytes:

	 * output threshold to 70% of max fifo size to make sure the

	 * threhold will not overflow

	 */

	threshold = width * height * vrefresh * 4 * 7 / 1000000;

	threshold = rdma_fifo_size * 7 / 10;

	reg = RDMA_FIFO_UNDERFLOW_EN |

	      RDMA_FIFO_PSEUDO_SIZE(rdma_fifo_size) |

	      RDMA_OUTPUT_VALID_FIFO_THRESHOLD(threshold);