lkml.org 
[lkml]   [2021]   [Jan]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH v9, 07/11] drm/mediatek: separate gamma module
    Hi, Yongqiang:

    Yongqiang Niu <yongqiang.niu@mediatek.com> 於 2021年1月7日 週四 上午11:12寫道:
    >
    > mt8183 gamma module will different with mt8173
    > separate gamma for add private data

    I've applied series "Decouple Mediatek DRM sub driver" [1] into
    mediatek-drm-next [2] and this patch would conflict with
    mediatek-drm-next, so please rebase this series onto
    mediatek-drm-next.

    [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=399915
    [2] https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux.git/log/?h=mediatek-drm-next

    Regards,
    Chun-Kuang.

    >
    > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
    > ---
    > drivers/gpu/drm/mediatek/Makefile | 1 +
    > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 185 ++++++++++++++++++++++++++++
    > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 58 +--------
    > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 +
    > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-
    > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 +
    > 6 files changed, 192 insertions(+), 58 deletions(-)
    > create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_gamma.c
    >
    > diff --git a/drivers/gpu/drm/mediatek/Makefile b/drivers/gpu/drm/mediatek/Makefile
    > index a892ede..17a08e2 100644
    > --- a/drivers/gpu/drm/mediatek/Makefile
    > +++ b/drivers/gpu/drm/mediatek/Makefile
    > @@ -1,6 +1,7 @@
    > # 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 \
    > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
    > new file mode 100644
    > index 0000000..8501821
    > --- /dev/null
    > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
    > @@ -0,0 +1,185 @@
    > +/*
    > + * SPDX-License-Identifier:
    > + *
    > + * Copyright (c) 2020 MediaTek Inc.
    > + */
    > +
    > +#include <linux/clk.h>
    > +#include <linux/component.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_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 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 mtk_ddp_comp ddp_comp;
    > + const struct mtk_disp_gamma_data *data;
    > +};
    > +
    > +static inline struct mtk_disp_gamma *comp_to_gamma(struct mtk_ddp_comp *comp)
    > +{
    > + return container_of(comp, struct mtk_disp_gamma, ddp_comp);
    > +}
    > +
    > +void mtk_gamma_set(struct mtk_ddp_comp *comp, 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(comp->regs + DISP_GAMMA_CFG);
    > + reg = reg | GAMMA_LUT_EN;
    > + writel(reg, comp->regs + DISP_GAMMA_CFG);
    > + lut_base = comp->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 void mtk_gamma_config(struct mtk_ddp_comp *comp, unsigned int w,
    > + unsigned int h, unsigned int vrefresh,
    > + unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
    > +{
    > + struct mtk_disp_gamma *gamma = comp_to_gamma(comp);
    > +
    > + mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_GAMMA_SIZE);
    > +
    > + mtk_dither_set(comp, bpc, DISP_GAMMA_CFG, cmdq_pkt);
    > +}
    > +
    > +static void mtk_gamma_start(struct mtk_ddp_comp *comp)
    > +{
    > + writel(GAMMA_EN, comp->regs + DISP_GAMMA_EN);
    > +}
    > +
    > +static void mtk_gamma_stop(struct mtk_ddp_comp *comp)
    > +{
    > + writel_relaxed(0x0, comp->regs + DISP_GAMMA_EN);
    > +}
    > +
    > +static const struct mtk_ddp_comp_funcs mtk_disp_gamma_funcs = {
    > + .gamma_set = mtk_gamma_set,
    > + .config = mtk_gamma_config,
    > + .start = mtk_gamma_start,
    > + .stop = mtk_gamma_stop,
    > +};
    > +
    > +static int mtk_disp_gamma_bind(struct device *dev, struct device *master,
    > + void *data)
    > +{
    > + struct mtk_disp_gamma *priv = dev_get_drvdata(dev);
    > + struct drm_device *drm_dev = data;
    > + int ret;
    > +
    > + ret = mtk_ddp_comp_register(drm_dev, &priv->ddp_comp);
    > + if (ret < 0) {
    > + dev_err(dev, "Failed to register component %pOF: %d\n",
    > + dev->of_node, ret);
    > + return ret;
    > + }
    > +
    > + return 0;
    > +}
    > +
    > +static void mtk_disp_gamma_unbind(struct device *dev, struct device *master,
    > + void *data)
    > +{
    > + struct mtk_disp_gamma *priv = dev_get_drvdata(dev);
    > + struct drm_device *drm_dev = data;
    > +
    > + mtk_ddp_comp_unregister(drm_dev, &priv->ddp_comp);
    > +}
    > +
    > +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;
    > + int comp_id;
    > + int ret;
    > +
    > + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
    > + if (!priv)
    > + return -ENOMEM;
    > +
    > + comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DISP_GAMMA);
    > + if (comp_id < 0) {
    > + dev_err(dev, "Failed to identify by alias: %d\n", comp_id);
    > + return comp_id;
    > + }
    > +
    > + ret = mtk_ddp_comp_init(dev, dev->of_node, &priv->ddp_comp, comp_id,
    > + &mtk_disp_gamma_funcs);
    > + if (ret) {
    > + if (ret != -EPROBE_DEFER)
    > + dev_err(dev, "Failed to initialize component: %d\n",
    > + ret);
    > +
    > + return ret;
    > + }
    > +
    > + 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,
    > + },
    > +};
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
    > index 3064eac..03589c9 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
    > @@ -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)
    > @@ -280,47 +272,6 @@ static void mtk_dither_stop(struct mtk_ddp_comp *comp)
    > writel_relaxed(0x0, comp->regs + DISP_DITHER_EN);
    > }
    >
    > -static void mtk_gamma_config(struct mtk_ddp_comp *comp, unsigned int w,
    > - unsigned int h, unsigned int vrefresh,
    > - unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
    > -{
    > - mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_GAMMA_SIZE);
    > - mtk_dither_set(comp, bpc, DISP_GAMMA_CFG, cmdq_pkt);
    > -}
    > -
    > -static void mtk_gamma_start(struct mtk_ddp_comp *comp)
    > -{
    > - writel(GAMMA_EN, comp->regs + DISP_GAMMA_EN);
    > -}
    > -
    > -static void mtk_gamma_stop(struct mtk_ddp_comp *comp)
    > -{
    > - writel_relaxed(0x0, comp->regs + DISP_GAMMA_EN);
    > -}
    > -
    > -static void mtk_gamma_set(struct mtk_ddp_comp *comp,
    > - 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(comp->regs + DISP_GAMMA_CFG);
    > - reg = reg | GAMMA_LUT_EN;
    > - writel(reg, comp->regs + DISP_GAMMA_CFG);
    > - lut_base = comp->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 = {
    > .gamma_set = mtk_gamma_set,
    > .config = mtk_aal_config,
    > @@ -341,13 +292,6 @@ static void mtk_gamma_set(struct mtk_ddp_comp *comp,
    > .stop = mtk_dither_stop,
    > };
    >
    > -static const struct mtk_ddp_comp_funcs ddp_gamma = {
    > - .gamma_set = mtk_gamma_set,
    > - .config = mtk_gamma_config,
    > - .start = mtk_gamma_start,
    > - .stop = mtk_gamma_stop,
    > -};
    > -
    > static const struct mtk_ddp_comp_funcs ddp_od = {
    > .config = mtk_od_config,
    > .start = mtk_od_start,
    > @@ -396,7 +340,7 @@ struct mtk_ddp_comp_match {
    > [DDP_COMPONENT_DSI1] = { MTK_DSI, 1, NULL },
    > [DDP_COMPONENT_DSI2] = { MTK_DSI, 2, NULL },
    > [DDP_COMPONENT_DSI3] = { MTK_DSI, 3, NULL },
    > - [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, &ddp_gamma },
    > + [DDP_COMPONENT_GAMMA] = { MTK_DISP_GAMMA, 0, NULL },
    > [DDP_COMPONENT_OD0] = { MTK_DISP_OD, 0, &ddp_od },
    > [DDP_COMPONENT_OD1] = { MTK_DISP_OD, 1, &ddp_od },
    > [DDP_COMPONENT_OVL0] = { MTK_DISP_OVL, 0, NULL },
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
    > index 5aa52b7..178fae9 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
    > @@ -179,6 +179,7 @@ int mtk_ddp_comp_init(struct device *dev, struct device_node *comp_node,
    > void mtk_ddp_comp_unregister(struct drm_device *drm, struct mtk_ddp_comp *comp);
    > void mtk_dither_set(struct mtk_ddp_comp *comp, unsigned int bpc,
    > unsigned int CFG, struct cmdq_pkt *cmdq_pkt);
    > +void mtk_gamma_set(struct mtk_ddp_comp *comp, struct drm_crtc_state *state);
    > enum mtk_ddp_comp_type mtk_ddp_comp_get_type(enum mtk_ddp_comp_id comp_id);
    > void mtk_ddp_write(struct cmdq_pkt *cmdq_pkt, unsigned int value,
    > struct mtk_ddp_comp *comp, unsigned int offset);
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
    > index 2f717df..37fec25 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
    > @@ -488,11 +488,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 ||
    > @@ -606,6 +607,7 @@ static SIMPLE_DEV_PM_OPS(mtk_drm_pm_ops, mtk_drm_sys_suspend,
    > static struct platform_driver * const mtk_drm_drivers[] = {
    > &mtk_ddp_driver,
    > &mtk_disp_color_driver,
    > + &mtk_disp_gamma_driver,
    > &mtk_disp_ovl_driver,
    > &mtk_disp_rdma_driver,
    > &mtk_dpi_driver,
    > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
    > index 5d771cf..bbd362b 100644
    > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h
    > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h
    > @@ -48,6 +48,7 @@ struct mtk_drm_private {
    >
    > extern struct platform_driver mtk_ddp_driver;
    > extern struct platform_driver mtk_disp_color_driver;
    > +extern struct platform_driver mtk_disp_gamma_driver;
    > extern struct platform_driver mtk_disp_ovl_driver;
    > extern struct platform_driver mtk_disp_rdma_driver;
    > extern struct platform_driver mtk_dpi_driver;
    > --
    > 1.8.1.1.dirty
    > _______________________________________________
    > Linux-mediatek mailing list
    > Linux-mediatek@lists.infradead.org
    > http://lists.infradead.org/mailman/listinfo/linux-mediatek

    \
     
     \ /
      Last update: 2021-01-07 11:27    [W:4.399 / U:1.276 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site