[PATCH 2/3] drm/mediatek: Add gamma lut support for mt8195
CK Hu
ck.hu at mediatek.com
Tue Aug 23 03:18:49 UTC 2022
Hi, Zheng-yan:
On Mon, 2022-08-22 at 17:19 +0800, zheng-yan.chen wrote:
> Since the previous gamma_set_common() function is designed for
> 9bit-to-10bit conversion, which is not feasible for the
> 10bit-to-12bit conversion in mt8195.
>
> Update the function to fit the need of mt8195.
>
Add Fixes tag [1].
[1]
https://www.kernel.org/doc/html/v5.19/process/submitting-patches.html
> Signed-off-by: zheng-yan.chen <zheng-yan.chen at mediatek.com>
>
> ---
> drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +-
> drivers/gpu/drm/mediatek/mtk_disp_drv.h | 3 +-
> drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 97 ++++++++++++++++---
> --
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 5 +-
> drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 1 -
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 1 +
> drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 1 +
> drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +
> 8 files changed, 83 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> index 0f9d7efb61d7..f46d4ab73d6a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
> @@ -66,7 +66,7 @@ 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, false);
> + mtk_gamma_set_common(aal->regs, state);
> }
>
> 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 33e61a136bbc..b662bf8b1c9d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h
> @@ -51,8 +51,9 @@ 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);
> +unsigned int mtk_gamma_size(struct device *dev);
> 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, bool lut_diff);
> +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);
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> index bbd558a036ec..a842e5e1962e 100644
> --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> @@ -18,18 +18,26 @@
> #define DISP_GAMMA_EN 0x0000
> #define GAMMA_EN BIT(0)
> #define DISP_GAMMA_CFG 0x0020
> +#define RELAY_MODE BIT(0)
> #define GAMMA_LUT_EN BIT(1)
> #define GAMMA_DITHERING BIT(2)
> #define DISP_GAMMA_SIZE 0x0030
> +#define DISP_GAMMA_BANK 0x0100
> #define DISP_GAMMA_LUT 0x0700
> -
> +#define DISP_GAMMA_LUT1 0x0b00
> #define LUT_10BIT_MASK 0x03ff
> -
> +#define TABLE_9BIT_SIZE 512
> +#define LUT_12BIT_MASK 0x0fff
> +#define TABLE_10BIT_SIZE 1024
> +#define BANK_SIZE 256
> struct mtk_disp_gamma_data {
> bool has_dither;
> bool lut_diff;
> + unsigned int lut_size;
> };
>
> +static unsigned int now_lut_size;
> +static bool now_lut_diff;
Don't use global variable.
> /*
> * struct mtk_disp_gamma - DISP_GAMMA driver structure
> */
> @@ -54,40 +62,73 @@ void mtk_gamma_clk_disable(struct device *dev)
> clk_disable_unprepare(gamma->clk);
> }
>
> -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state
> *state, bool lut_diff)
> +void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state
> *state)
> {
> - unsigned int i, reg;
> - struct drm_color_lut *lut;
> + unsigned int i, reg, idx;
> void __iomem *lut_base;
> - u32 word;
> - u32 diff[3] = {0};
> + void __iomem *lut1_base;
> + u32 word, word1;
>
> if (state->gamma_lut) {
> + u32 table_size;
> + u32 mask;
> + struct drm_color_lut color, even, odd;
> + struct drm_color_lut *lut = (struct drm_color_lut
> *)state->gamma_lut;
> + bool lut_12bit = (now_lut_size == TABLE_10BIT_SIZE);
> +
> reg = readl(regs + DISP_GAMMA_CFG);
> + reg = reg & ~RELAY_MODE;
Why do you modify this for other SoC?
> 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++) {
> + lut1_base = regs + DISP_GAMMA_LUT1;
> + if (lut_12bit) {
> + table_size = TABLE_10BIT_SIZE;
> + mask = LUT_12BIT_MASK;
lut_bits and lut_size are independent factor, so use two variable in
private data for each. And I like to use digital value instead of a
symbol.
lut_bits = 10 or 12;
lut_size = 512 or 1024;
mask = GENMASK(lut_bits - 1, 0);
> + } else {
> + table_size = TABLE_9BIT_SIZE;
> + mask = LUT_10BIT_MASK;
> + }
>
> - if (!lut_diff || (i % 2 == 0)) {
> - word = (((lut[i].red >> 6) &
> LUT_10BIT_MASK) << 20) +
> - (((lut[i].green >> 6) &
> LUT_10BIT_MASK) << 10) +
> - ((lut[i].blue >> 6) &
> LUT_10BIT_MASK);
> + for (i = 0; i < table_size; i++) {
> + if (!(i % BANK_SIZE) && lut_12bit)
> + writel((i / BANK_SIZE), regs +
> DISP_GAMMA_BANK);
Group register writing together, so move this to bottom of this for-
loop.
> +
> + color.red = (lut[i].red >> 6) & mask;
> + color.green = (lut[i].green >> 6) & mask;
> + color.blue = (lut[i].blue >> 6) & mask;
Why shift 6 bits for lut 12 bits?
> + if ((i % 2) && now_lut_diff) {
In original code, !lut_diff is first, so I would like you to keep this
order.
> + odd = color;
> + word = (lut_12bit) ? (((odd.green -
> even.green) << 12) +
> + (odd.red -
> even.red))
> + : (((odd.red -
> even.red) << 20) +
> + ((odd.green -
> even.green) << 10) +
> + (odd.blue -
> even.blue));
> + word1 = (odd.blue - even.blue);
I think it's not necessary to create odd and even variable.
Regards,
CK
> } else {
> - diff[0] = (lut[i].red >> 6) - (lut[i -
> 1].red >> 6);
> - diff[1] = (lut[i].green >> 6) - (lut[i
> - 1].green >> 6);
> - diff[2] = (lut[i].blue >> 6) - (lut[i -
> 1].blue >> 6);
> -
> - word = ((diff[0] & LUT_10BIT_MASK) <<
> 20) +
> - ((diff[1] & LUT_10BIT_MASK) <<
> 10) +
> - (diff[2] & LUT_10BIT_MASK);
> + even = color;
> + word = (lut_12bit) ? ((even.green <<
> 12) + even.red)
> + : ((even.red << 20)
> +
> + (even.green <<
> 10) + even.blue);
> + word1 = even.blue;
> }
> - writel(word, (lut_base + i * 4));
> + idx = (lut_12bit) ? (i % BANK_SIZE) : i;
> + writel(word, (lut_base + idx * 4));
> + if (lut_12bit)
> + writel(word1, (lut1_base + idx * 4));
> }
> }
> }
>
> +unsigned int mtk_gamma_size(struct device *dev)
> +{
> + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);
> +
> + if (gamma->data)
> + return gamma->data->lut_size;
> + else
> + return 0;
> +}
> void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)
> {
> struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);
> @@ -95,8 +136,7 @@ void mtk_gamma_set(struct device *dev, struct
> drm_crtc_state *state)
>
> if (gamma->data)
> lut_diff = gamma->data->lut_diff;
> -
> - mtk_gamma_set_common(gamma->regs, state, lut_diff);
> + mtk_gamma_set_common(gamma->regs, state);
> }
>
> void mtk_gamma_config(struct device *dev, unsigned int w,
> @@ -178,6 +218,8 @@ static int mtk_disp_gamma_probe(struct
> platform_device *pdev)
> ret = component_add(dev, &mtk_disp_gamma_component_ops);
> if (ret)
> dev_err(dev, "Failed to add component: %d\n", ret);
> + now_lut_size = priv->data->lut_size;
> + now_lut_diff = priv->data->lut_diff;
>
> return ret;
> }
> @@ -191,10 +233,17 @@ static int mtk_disp_gamma_remove(struct
> platform_device *pdev)
>
> static const struct mtk_disp_gamma_data mt8173_gamma_driver_data = {
> .has_dither = true,
> + .lut_size = 512,
> };
>
> static const struct mtk_disp_gamma_data mt8183_gamma_driver_data = {
> .lut_diff = true,
> + .lut_size = 512,
> +};
> +
> +static const struct mtk_disp_gamma_data mt8195_gamma_driver_data = {
> + .lut_diff = true,
> + .lut_size = 1024,
> };
>
> static const struct of_device_id mtk_disp_gamma_driver_dt_match[] =
> {
> @@ -202,6 +251,8 @@ static const struct of_device_id
> mtk_disp_gamma_driver_dt_match[] = {
> .data = &mt8173_gamma_driver_data},
> { .compatible = "mediatek,mt8183-disp-gamma",
> .data = &mt8183_gamma_driver_data},
> + { .compatible = "mediatek,mt8195-disp-gamma",
> + .data = &mt8195_gamma_driver_data},
> {},
> };
> MODULE_DEVICE_TABLE(of, mtk_disp_gamma_driver_dt_match);
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index 42cc7052b050..2a6513259562 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -930,9 +930,8 @@ int mtk_drm_crtc_create(struct drm_device
> *drm_dev,
> mtk_crtc->ddp_comp[i] = comp;
>
> if (comp->funcs) {
> - if (comp->funcs->gamma_set)
> - gamma_lut_size = MTK_LUT_SIZE;
> -
> + if (comp->funcs->gamma_set && comp->funcs-
> >gamma_size)
> + gamma_lut_size = comp->funcs-
> >gamma_size(comp->dev);
> if (comp->funcs->ctm_set)
> has_ctm = true;
> }
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> index cb9a36c48d4f..1799853ef89a 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> @@ -10,7 +10,6 @@
> #include "mtk_drm_ddp_comp.h"
> #include "mtk_drm_plane.h"
>
> -#define MTK_LUT_SIZE 512
> #define MTK_MAX_BPC 10
> #define MTK_MIN_BPC 3
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> index 2d72cc5ddaba..4c6538a17b88 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c
> @@ -323,6 +323,7 @@ static const struct mtk_ddp_comp_funcs ddp_gamma
> = {
> .clk_enable = mtk_gamma_clk_enable,
> .clk_disable = mtk_gamma_clk_disable,
> .gamma_set = mtk_gamma_set,
> + .gamma_size = mtk_gamma_size,
> .config = mtk_gamma_config,
> .start = mtk_gamma_start,
> .stop = mtk_gamma_stop,
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> index 2d0052c23dcb..bf0cf7f86010 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h
> @@ -59,6 +59,7 @@ struct mtk_ddp_comp_funcs {
> void (*disable_vblank)(struct device *dev);
> unsigned int (*supported_rotations)(struct device *dev);
> unsigned int (*layer_nr)(struct device *dev);
> + unsigned int (*gamma_size)(struct device *dev);
> int (*layer_check)(struct device *dev,
> unsigned int idx,
> struct mtk_plane_state *state);
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index 0e4c77724b05..473766be56e1 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -567,6 +567,8 @@ static const struct of_device_id
> mtk_ddp_comp_dt_ids[] = {
> .data = (void *)MTK_DISP_GAMMA, },
> { .compatible = "mediatek,mt8183-disp-gamma",
> .data = (void *)MTK_DISP_GAMMA, },
> + { .compatible = "mediatek,mt8195-disp-gamma",
> + .data = (void *)MTK_DISP_GAMMA, },
> { .compatible = "mediatek,mt8195-disp-merge",
> .data = (void *)MTK_DISP_MERGE },
> { .compatible = "mediatek,mt2701-disp-mutex",
More information about the dri-devel
mailing list