drm/mediatek: Separate ccorr module
authorYongqiang Niu <yongqiang.niu@mediatek.com>
Tue, 2 Feb 2021 08:12:33 +0000 (16:12 +0800)
committerChun-Kuang Hu <chunkuang.hu@kernel.org>
Thu, 4 Feb 2021 14:55:46 +0000 (22:55 +0800)
ccorr ctm matrix bits will be different in mt8192.

Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com>
Signed-off-by: Hsin-Yi Wang <hsinyi@chromium.org>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
drivers/gpu/drm/mediatek/Makefile
drivers/gpu/drm/mediatek/mtk_disp_ccorr.c [new file with mode: 0644]
drivers/gpu/drm/mediatek/mtk_disp_drv.h
drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
drivers/gpu/drm/mediatek/mtk_drm_drv.c
drivers/gpu/drm/mediatek/mtk_drm_drv.h

index b64674b..dc54a7a 100644 (file)
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 
-mediatek-drm-y := mtk_disp_color.o \
+mediatek-drm-y := mtk_disp_ccorr.o \
+                 mtk_disp_color.o \
                  mtk_disp_gamma.o \
                  mtk_disp_ovl.o \
                  mtk_disp_rdma.o \
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c b/drivers/gpu/drm/mediatek/mtk_disp_ccorr.c
new file mode 100644 (file)
index 0000000..6ee2431
--- /dev/null
@@ -0,0 +1,216 @@
+// 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_CCORR_EN                          0x0000
+#define CCORR_EN                                       BIT(0)
+#define DISP_CCORR_CFG                         0x0020
+#define CCORR_RELAY_MODE                               BIT(0)
+#define CCORR_ENGINE_EN                                        BIT(1)
+#define CCORR_GAMMA_OFF                                        BIT(2)
+#define CCORR_WGAMUT_SRC_CLIP                          BIT(3)
+#define DISP_CCORR_SIZE                                0x0030
+#define DISP_CCORR_COEF_0                      0x0080
+#define DISP_CCORR_COEF_1                      0x0084
+#define DISP_CCORR_COEF_2                      0x0088
+#define DISP_CCORR_COEF_3                      0x008C
+#define DISP_CCORR_COEF_4                      0x0090
+
+struct mtk_disp_ccorr_data {
+       u32 reserved;
+};
+
+/**
+ * struct mtk_disp_ccorr - DISP_CCORR driver structure
+ * @ddp_comp - structure containing type enum and hardware resources
+ * @crtc - associated crtc to report irq events to
+ */
+struct mtk_disp_ccorr {
+       struct clk *clk;
+       void __iomem *regs;
+       struct cmdq_client_reg cmdq_reg;
+       const struct mtk_disp_ccorr_data        *data;
+};
+
+int mtk_ccorr_clk_enable(struct device *dev)
+{
+       struct mtk_disp_ccorr *ccorr = dev_get_drvdata(dev);
+
+       return clk_prepare_enable(ccorr->clk);
+}
+
+void mtk_ccorr_clk_disable(struct device *dev)
+{
+       struct mtk_disp_ccorr *ccorr = dev_get_drvdata(dev);
+
+       clk_disable_unprepare(ccorr->clk);
+}
+
+void mtk_ccorr_config(struct device *dev, unsigned int w,
+                            unsigned int h, unsigned int vrefresh,
+                            unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
+{
+       struct mtk_disp_ccorr *ccorr = dev_get_drvdata(dev);
+
+       mtk_ddp_write(cmdq_pkt, h << 16 | w, &ccorr->cmdq_reg, ccorr->regs,
+                     DISP_CCORR_SIZE);
+       mtk_ddp_write(cmdq_pkt, CCORR_ENGINE_EN, &ccorr->cmdq_reg, ccorr->regs,
+                     DISP_CCORR_CFG);
+}
+
+void mtk_ccorr_start(struct device *dev)
+{
+       struct mtk_disp_ccorr *ccorr = dev_get_drvdata(dev);
+
+       writel(CCORR_EN, ccorr->regs + DISP_CCORR_EN);
+}
+
+void mtk_ccorr_stop(struct device *dev)
+{
+       struct mtk_disp_ccorr *ccorr = dev_get_drvdata(dev);
+
+       writel_relaxed(0x0, ccorr->regs + DISP_CCORR_EN);
+}
+
+/* Converts a DRM S31.32 value to the HW S1.10 format. */
+static u16 mtk_ctm_s31_32_to_s1_10(u64 in)
+{
+       u16 r;
+
+       /* Sign bit. */
+       r = in & BIT_ULL(63) ? BIT(11) : 0;
+
+       if ((in & GENMASK_ULL(62, 33)) > 0) {
+               /* identity value 0x100000000 -> 0x400, */
+               /* if bigger this, set it to max 0x7ff. */
+               r |= GENMASK(10, 0);
+       } else {
+               /* take the 11 most important bits. */
+               r |= (in >> 22) & GENMASK(10, 0);
+       }
+
+       return r;
+}
+
+void mtk_ccorr_ctm_set(struct device *dev, struct drm_crtc_state *state)
+{
+       struct mtk_disp_ccorr *ccorr = dev_get_drvdata(dev);
+       struct drm_property_blob *blob = state->ctm;
+       struct drm_color_ctm *ctm;
+       const u64 *input;
+       uint16_t coeffs[9] = { 0 };
+       int i;
+       struct cmdq_pkt *cmdq_pkt = NULL;
+
+       if (!blob)
+               return;
+
+       ctm = (struct drm_color_ctm *)blob->data;
+       input = ctm->matrix;
+
+       for (i = 0; i < ARRAY_SIZE(coeffs); i++)
+               coeffs[i] = mtk_ctm_s31_32_to_s1_10(input[i]);
+
+       mtk_ddp_write(cmdq_pkt, coeffs[0] << 16 | coeffs[1],
+                     &ccorr->cmdq_reg, ccorr->regs, DISP_CCORR_COEF_0);
+       mtk_ddp_write(cmdq_pkt, coeffs[2] << 16 | coeffs[3],
+                     &ccorr->cmdq_reg, ccorr->regs, DISP_CCORR_COEF_1);
+       mtk_ddp_write(cmdq_pkt, coeffs[4] << 16 | coeffs[5],
+                     &ccorr->cmdq_reg, ccorr->regs, DISP_CCORR_COEF_2);
+       mtk_ddp_write(cmdq_pkt, coeffs[6] << 16 | coeffs[7],
+                     &ccorr->cmdq_reg, ccorr->regs, DISP_CCORR_COEF_3);
+       mtk_ddp_write(cmdq_pkt, coeffs[8] << 16,
+                     &ccorr->cmdq_reg, ccorr->regs, DISP_CCORR_COEF_4);
+}
+
+static int mtk_disp_ccorr_bind(struct device *dev, struct device *master,
+                              void *data)
+{
+       return 0;
+}
+
+static void mtk_disp_ccorr_unbind(struct device *dev, struct device *master,
+                                 void *data)
+{
+}
+
+static const struct component_ops mtk_disp_ccorr_component_ops = {
+       .bind   = mtk_disp_ccorr_bind,
+       .unbind = mtk_disp_ccorr_unbind,
+};
+
+static int mtk_disp_ccorr_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct mtk_disp_ccorr *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 ccorr 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 ccorr\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_ccorr_component_ops);
+       if (ret)
+               dev_err(dev, "Failed to add component: %d\n", ret);
+
+       return ret;
+}
+
+static int mtk_disp_ccorr_remove(struct platform_device *pdev)
+{
+       component_del(&pdev->dev, &mtk_disp_ccorr_component_ops);
+
+       return 0;
+}
+
+static const struct of_device_id mtk_disp_ccorr_driver_dt_match[] = {
+       { .compatible = "mediatek,mt8183-disp-ccorr"},
+       {},
+};
+MODULE_DEVICE_TABLE(of, mtk_disp_ccorr_driver_dt_match);
+
+struct platform_driver mtk_disp_ccorr_driver = {
+       .probe          = mtk_disp_ccorr_probe,
+       .remove         = mtk_disp_ccorr_remove,
+       .driver         = {
+               .name   = "mediatek-disp-ccorr",
+               .owner  = THIS_MODULE,
+               .of_match_table = mtk_disp_ccorr_driver_dt_match,
+       },
+};
index cdb0383..cafd9df 100644 (file)
@@ -9,6 +9,15 @@
 #include <linux/soc/mediatek/mtk-cmdq.h>
 #include "mtk_drm_plane.h"
 
+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);
+void mtk_ccorr_config(struct device *dev, unsigned int w,
+                     unsigned int h, unsigned int vrefresh,
+                     unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
+void mtk_ccorr_start(struct device *dev);
+void mtk_ccorr_stop(struct device *dev);
+
 void mtk_color_bypass_shadow(struct device *dev);
 int mtk_color_clk_enable(struct device *dev);
 void mtk_color_clk_disable(struct device *dev);
index 1b1a305..75bc00e 100644 (file)
 #define DISP_AAL_EN                            0x0000
 #define DISP_AAL_SIZE                          0x0030
 
-#define DISP_CCORR_EN                          0x0000
-#define CCORR_EN                               BIT(0)
-#define DISP_CCORR_CFG                         0x0020
-#define CCORR_RELAY_MODE                       BIT(0)
-#define CCORR_ENGINE_EN                                BIT(1)
-#define CCORR_GAMMA_OFF                                BIT(2)
-#define CCORR_WGAMUT_SRC_CLIP                  BIT(3)
-#define DISP_CCORR_SIZE                                0x0030
-#define DISP_CCORR_COEF_0                      0x0080
-#define DISP_CCORR_COEF_1                      0x0084
-#define DISP_CCORR_COEF_2                      0x0088
-#define DISP_CCORR_COEF_3                      0x008C
-#define DISP_CCORR_COEF_4                      0x0090
-
 #define DISP_DITHER_EN                         0x0000
 #define DITHER_EN                              BIT(0)
 #define DISP_DITHER_CFG                                0x0020
@@ -234,82 +220,6 @@ static void mtk_aal_stop(struct device *dev)
        writel_relaxed(0x0, priv->regs + DISP_AAL_EN);
 }
 
-static void mtk_ccorr_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_CCORR_SIZE);
-       mtk_ddp_write(cmdq_pkt, CCORR_ENGINE_EN, &priv->cmdq_reg, priv->regs, DISP_CCORR_CFG);
-}
-
-static void mtk_ccorr_start(struct device *dev)
-{
-       struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);
-
-       writel(CCORR_EN, priv->regs + DISP_CCORR_EN);
-}
-
-static void mtk_ccorr_stop(struct device *dev)
-{
-       struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);
-
-       writel_relaxed(0x0, priv->regs + DISP_CCORR_EN);
-}
-
-/* Converts a DRM S31.32 value to the HW S1.10 format. */
-static u16 mtk_ctm_s31_32_to_s1_10(u64 in)
-{
-       u16 r;
-
-       /* Sign bit. */
-       r = in & BIT_ULL(63) ? BIT(11) : 0;
-
-       if ((in & GENMASK_ULL(62, 33)) > 0) {
-               /* identity value 0x100000000 -> 0x400, */
-               /* if bigger this, set it to max 0x7ff. */
-               r |= GENMASK(10, 0);
-       } else {
-               /* take the 11 most important bits. */
-               r |= (in >> 22) & GENMASK(10, 0);
-       }
-
-       return r;
-}
-
-static void mtk_ccorr_ctm_set(struct device *dev,
-                             struct drm_crtc_state *state)
-{
-       struct mtk_ddp_comp_dev *priv = dev_get_drvdata(dev);
-       struct drm_property_blob *blob = state->ctm;
-       struct drm_color_ctm *ctm;
-       const u64 *input;
-       uint16_t coeffs[9] = { 0 };
-       int i;
-       struct cmdq_pkt *cmdq_pkt = NULL;
-
-       if (!blob)
-               return;
-
-       ctm = (struct drm_color_ctm *)blob->data;
-       input = ctm->matrix;
-
-       for (i = 0; i < ARRAY_SIZE(coeffs); i++)
-               coeffs[i] = mtk_ctm_s31_32_to_s1_10(input[i]);
-
-       mtk_ddp_write(cmdq_pkt, coeffs[0] << 16 | coeffs[1],
-                     &priv->cmdq_reg, priv->regs, DISP_CCORR_COEF_0);
-       mtk_ddp_write(cmdq_pkt, coeffs[2] << 16 | coeffs[3],
-                     &priv->cmdq_reg, priv->regs, DISP_CCORR_COEF_1);
-       mtk_ddp_write(cmdq_pkt, coeffs[4] << 16 | coeffs[5],
-                     &priv->cmdq_reg, priv->regs, DISP_CCORR_COEF_2);
-       mtk_ddp_write(cmdq_pkt, coeffs[6] << 16 | coeffs[7],
-                     &priv->cmdq_reg, priv->regs, DISP_CCORR_COEF_3);
-       mtk_ddp_write(cmdq_pkt, coeffs[8] << 16,
-                     &priv->cmdq_reg, priv->regs, DISP_CCORR_COEF_4);
-}
-
 static void mtk_dither_config(struct device *dev, unsigned int w,
                              unsigned int h, unsigned int vrefresh,
                              unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
@@ -346,8 +256,8 @@ static const struct mtk_ddp_comp_funcs ddp_aal = {
 };
 
 static const struct mtk_ddp_comp_funcs ddp_ccorr = {
-       .clk_enable = mtk_ddp_clk_enable,
-       .clk_disable = mtk_ddp_clk_disable,
+       .clk_enable = mtk_ccorr_clk_enable,
+       .clk_disable = mtk_ccorr_clk_disable,
        .config = mtk_ccorr_config,
        .start = mtk_ccorr_start,
        .stop = mtk_ccorr_stop,
@@ -596,6 +506,7 @@ int mtk_ddp_comp_init(struct device_node *node, struct mtk_ddp_comp *comp,
        }
 
        if (type == MTK_DISP_BLS ||
+           type == MTK_DISP_CCORR ||
            type == MTK_DISP_COLOR ||
            type == MTK_DISP_GAMMA ||
            type == MTK_DPI ||
index 486e73e..b013d56 100644 (file)
@@ -531,11 +531,12 @@ static int mtk_drm_probe(struct platform_device *pdev)
                private->comp_node[comp_id] = of_node_get(node);
 
                /*
-                * Currently only the COLOR, GAMMA, OVL, RDMA, DSI, and DPI blocks have
-                * separate component platform drivers and initialize their own
+                * Currently only the CCORR, 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 ||
+               if (comp_type == MTK_DISP_CCORR ||
+                   comp_type == MTK_DISP_COLOR ||
                    comp_type == MTK_DISP_GAMMA ||
                    comp_type == MTK_DISP_OVL ||
                    comp_type == MTK_DISP_OVL_2L ||
@@ -634,6 +635,7 @@ static struct platform_driver mtk_drm_platform_driver = {
 };
 
 static struct platform_driver * const mtk_drm_drivers[] = {
+       &mtk_disp_ccorr_driver,
        &mtk_disp_color_driver,
        &mtk_disp_gamma_driver,
        &mtk_disp_ovl_driver,
index 0e54e3d..637f566 100644 (file)
@@ -46,6 +46,7 @@ struct mtk_drm_private {
        struct drm_atomic_state *suspend_state;
 };
 
+extern struct platform_driver mtk_disp_ccorr_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;