drm/mediatek: gamma: Support multi-bank gamma LUT

Newer Gamma IP have got multiple LUT banks: support specifying the
size of the LUT banks and handle bank-switching before programming
the LUT in mtk_gamma_set_common() in preparation for adding support
for MT8195 and newer SoCs.

Suggested-by: Jason-JH.Lin <jason-jh.lin@mediatek.com>
[Angelo: Refactored original commit]
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
Reviewed-by: CK Hu <ck.hu@mediatek.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20231012095736.100784-10-angelogioacchino.delregno@collabora.com/
Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
index f97c194f9caae6c9eb9cd6cea32bf6b21fabb785..4516eaf577b2aeb2442e7d51c2c9d20b41316ae0 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
@@ -17,10 +17,17 @@
 
 #define DISP_AAL_EN                            0x0000
 #define AAL_EN                                         BIT(0)
+#define DISP_AAL_CFG                           0x0020
+#define AAL_GAMMA_LUT_EN                               BIT(1)
 #define DISP_AAL_SIZE                          0x0030
 #define DISP_AAL_SIZE_HSIZE                            GENMASK(28, 16)
 #define DISP_AAL_SIZE_VSIZE                            GENMASK(12, 0)
 #define DISP_AAL_OUTPUT_SIZE                   0x04d8
+#define DISP_AAL_GAMMA_LUT                     0x0700
+#define DISP_AAL_GAMMA_LUT_R                           GENMASK(29, 20)
+#define DISP_AAL_GAMMA_LUT_G                           GENMASK(19, 10)
+#define DISP_AAL_GAMMA_LUT_B                           GENMASK(9, 0)
+#define DISP_AAL_LUT_BITS                      10
 #define DISP_AAL_LUT_SIZE                      512
 
 struct mtk_disp_aal_data {
@@ -80,9 +87,39 @@ unsigned int mtk_aal_gamma_get_lut_size(struct device *dev)
 void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state)
 {
        struct mtk_disp_aal *aal = dev_get_drvdata(dev);
+       struct drm_color_lut *lut;
+       unsigned int i;
+       u32 cfg_val;
+
+       /* If gamma is not supported in AAL, go out immediately */
+       if (!(aal->data && aal->data->has_gamma))
+               return;
+
+       /* Also, if there's no gamma lut there's nothing to do here. */
+       if (!state->gamma_lut)
+               return;
+
+       lut = (struct drm_color_lut *)state->gamma_lut->data;
+       for (i = 0; i < DISP_AAL_LUT_SIZE; i++) {
+               struct drm_color_lut hwlut = {
+                       .red = drm_color_lut_extract(lut[i].red, DISP_AAL_LUT_BITS),
+                       .green = drm_color_lut_extract(lut[i].green, DISP_AAL_LUT_BITS),
+                       .blue = drm_color_lut_extract(lut[i].blue, DISP_AAL_LUT_BITS)
+               };
+               u32 word;
+
+               word = FIELD_PREP(DISP_AAL_GAMMA_LUT_R, hwlut.red);
+               word |= FIELD_PREP(DISP_AAL_GAMMA_LUT_G, hwlut.green);
+               word |= FIELD_PREP(DISP_AAL_GAMMA_LUT_B, hwlut.blue);
+               writel(word, aal->regs + DISP_AAL_GAMMA_LUT + i * 4);
+       }
 
-       if (aal->data && aal->data->has_gamma)
-               mtk_gamma_set_common(NULL, aal->regs, state);
+       cfg_val = readl(aal->regs + DISP_AAL_CFG);
+
+       /* Enable the gamma table */
+       cfg_val |= FIELD_PREP(AAL_GAMMA_LUT_EN, 1);
+
+       writel(cfg_val, aal->regs + DISP_AAL_CFG);
 }
 
 void mtk_aal_start(struct device *dev)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
index ade2108a3273676cf841fc61a602ed211a03d9bd..1311562d25cc2fabb19ca346f8dddac3867ee657 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
+++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
@@ -58,7 +58,6 @@ void mtk_gamma_config(struct device *dev, unsigned int w,
                      unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
 unsigned int mtk_gamma_get_lut_size(struct device *dev);
 void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state);
-void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state);
 void mtk_gamma_start(struct device *dev);
 void mtk_gamma_stop(struct device *dev);
 

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
index 95493de24a000202f5a89fd94ebb602c694e5146..421a3edad7704c18a11918a2b70c8aff63dccff0 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
@@ -24,6 +24,8 @@
 #define DISP_GAMMA_SIZE                                0x0030
 #define DISP_GAMMA_SIZE_HSIZE                          GENMASK(28, 16)
 #define DISP_GAMMA_SIZE_VSIZE                          GENMASK(12, 0)
+#define DISP_GAMMA_BANK                                0x0100
+#define DISP_GAMMA_BANK_BANK                           GENMASK(1, 0)
 #define DISP_GAMMA_LUT                         0x0700
 
 #define DISP_GAMMA_LUT_10BIT_R                 GENMASK(29, 20)
@@ -33,6 +35,7 @@
 struct mtk_disp_gamma_data {
        bool has_dither;
        bool lut_diff;
+       u16 lut_bank_size;
        u16 lut_size;
 };
 
@@ -75,40 +78,53 @@ void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)
        unsigned int i;
        struct drm_color_lut *lut;
        void __iomem *lut_base;
-       u32 cfg_val, word;
+       u32 cfg_val, lbank_val, word;
+       int cur_bank, num_lut_banks;
 
        /* If there's no gamma lut there's nothing to do here. */
        if (!state->gamma_lut)
                return;
 
+       num_lut_banks = gamma->data->lut_size / gamma->data->lut_bank_size;
        lut_base = gamma->regs + DISP_GAMMA_LUT;
        lut = (struct drm_color_lut *)state->gamma_lut->data;
-       for (i = 0; i < gamma->data->lut_size; i++) {
-               struct drm_color_lut diff, hwlut;
-
-               hwlut.red = drm_color_lut_extract(lut[i].red, 10);
-               hwlut.green = drm_color_lut_extract(lut[i].green, 10);
-               hwlut.blue = drm_color_lut_extract(lut[i].blue, 10);
-
-               if (!gamma->data->lut_diff || (i % 2 == 0)) {
-                       word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red);
-                       word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, hwlut.green);
-                       word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, hwlut.blue);
-               } else {
-                       diff.red = lut[i].red - lut[i - 1].red;
-                       diff.red = drm_color_lut_extract(diff.red, 10);
-
-                       diff.green = lut[i].green - lut[i - 1].green;
-                       diff.green = drm_color_lut_extract(diff.green, 10);
-
-                       diff.blue = lut[i].blue - lut[i - 1].blue;
-                       diff.blue = drm_color_lut_extract(diff.blue, 10);
-
-                       word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, diff.red);
-                       word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, diff.green);
-                       word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, diff.blue);
+
+       for (cur_bank = 0; cur_bank < num_lut_banks; cur_bank++) {
+
+               /* Switch gamma bank and set data mode before writing LUT */
+               if (num_lut_banks > 1) {
+                       lbank_val = FIELD_PREP(DISP_GAMMA_BANK_BANK, cur_bank);
+                       writel(lbank_val, gamma->regs + DISP_GAMMA_BANK);
+               }
+
+               for (i = 0; i < gamma->data->lut_bank_size; i++) {
+                       int n = cur_bank * gamma->data->lut_bank_size + i;
+                       struct drm_color_lut diff, hwlut;
+
+                       hwlut.red = drm_color_lut_extract(lut[n].red, 10);
+                       hwlut.green = drm_color_lut_extract(lut[n].green, 10);
+                       hwlut.blue = drm_color_lut_extract(lut[n].blue, 10);
+
+                       if (!gamma->data->lut_diff || (i % 2 == 0)) {
+                               word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red);
+                               word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, hwlut.green);
+                               word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, hwlut.blue);
+                       } else {
+                               diff.red = lut[n].red - lut[n - 1].red;
+                               diff.red = drm_color_lut_extract(diff.red, 10);
+
+                               diff.green = lut[n].green - lut[n - 1].green;
+                               diff.green = drm_color_lut_extract(diff.green, 10);
+
+                               diff.blue = lut[n].blue - lut[n - 1].blue;
+                               diff.blue = drm_color_lut_extract(diff.blue, 10);
+
+                               word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, diff.red);
+                               word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, diff.green);
+                               word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, diff.blue);
+                       }
+                       writel(word, lut_base + i * 4);
                }
-               writel(word, lut_base + i * 4);
        }
 
        cfg_val = readl(gamma->regs + DISP_GAMMA_CFG);
@@ -212,10 +228,12 @@ static void mtk_disp_gamma_remove(struct platform_device *pdev)
 
 static const struct mtk_disp_gamma_data mt8173_gamma_driver_data = {
        .has_dither = true,
+       .lut_bank_size = 512,
        .lut_size = 512,
 };
 
 static const struct mtk_disp_gamma_data mt8183_gamma_driver_data = {
+       .lut_bank_size = 512,
        .lut_diff = true,
        .lut_size = 512,
 };