diff mbox series

[v10,10/16] drm/mediatek: gamma: Support multi-bank gamma LUT

Message ID 20230804072850.89365-11-angelogioacchino.delregno@collabora.com (mailing list archive)
State New, archived
Headers show
Series MediaTek DDP GAMMA - 12-bit LUT support | expand

Commit Message

AngeloGioacchino Del Regno Aug. 4, 2023, 7:28 a.m. UTC 
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]
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 70 ++++++++++++++---------
 1 file changed, 44 insertions(+), 26 deletions(-)

Comments

CK Hu (胡俊光) Oct. 12, 2023, 3:36 a.m. UTC | #1 
Hi, Angelo:

On Fri, 2023-08-04 at 09:28 +0200, AngeloGioacchino Del Regno wrote:
> 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]
> Signed-off-by: AngeloGioacchino Del Regno <
> angelogioacchino.delregno@collabora.com>
> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 70 ++++++++++++++-------
> --
>  1 file changed, 44 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
> index 1845bd326a6d..3f1c6815ea5a 100644
> --- 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)
> @@ -37,6 +39,7 @@
>  struct mtk_disp_gamma_data {
>  	bool has_dither;
>  	bool lut_diff;
> +	u16 lut_bank_size;
>  	u16 lut_size;
>  	u8 lut_bits;
>  };
> @@ -80,41 +83,54 @@ 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;
>  	cfg_val = readl(gamma->regs + DISP_GAMMA_CFG);
>  	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, gamma-
> >data->lut_bits);
> -		hwlut.green = drm_color_lut_extract(lut[i].green,
> gamma->data->lut_bits);
> -		hwlut.blue = drm_color_lut_extract(lut[i].blue, gamma-
> >data->lut_bits);
> -
> -		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,
> gamma->data->lut_bits);
> -
> -			diff.green = lut[i].green - lut[i - 1].green;
> -			diff.green = drm_color_lut_extract(diff.green,
> gamma->data->lut_bits);
> -
> -			diff.blue = lut[i].blue - lut[i - 1].blue;
> -			diff.blue = drm_color_lut_extract(diff.blue,
> gamma->data->lut_bits);
> -
> -			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;

int n = cur_bank * gamma->data->lut_bank_size + i;

After this modification,

Reviewed-by: CK Hu <ck.hu@mediatek.com>

> +			struct drm_color_lut diff, hwlut;
> +
> +			hwlut.red = drm_color_lut_extract(lut[n].red,
> gamma->data->lut_bits);
> +			hwlut.green =
> drm_color_lut_extract(lut[n].green, gamma->data->lut_bits);
> +			hwlut.blue = drm_color_lut_extract(lut[n].blue,
> gamma->data->lut_bits);
> +
> +			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, gamma->data->lut_bits);
> +
> +				diff.green = lut[n].green - lut[n -
> 1].green;
> +				diff.green =
> drm_color_lut_extract(diff.green, gamma->data->lut_bits);
> +
> +				diff.blue = lut[n].blue - lut[n -
> 1].blue;
> +				diff.blue =
> drm_color_lut_extract(diff.blue, gamma->data->lut_bits);
> +
> +				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));
>  	}
>  
>  	/* Enable the gamma table */
> @@ -218,11 +234,13 @@ 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_bank_size = 512,
>  	.lut_bits = 10,
>  	.lut_size = 512,
>  };
>  
>  static const struct mtk_disp_gamma_data mt8183_gamma_driver_data = {
> +	.lut_bank_size = 512,
>  	.lut_bits = 10,
>  	.lut_diff = true,
>  	.lut_size = 512,
diff mbox series

Patch

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c
index 1845bd326a6d..3f1c6815ea5a 100644
--- 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)
@@ -37,6 +39,7 @@ 
 struct mtk_disp_gamma_data {
 	bool has_dither;
 	bool lut_diff;
+	u16 lut_bank_size;
 	u16 lut_size;
 	u8 lut_bits;
 };
@@ -80,41 +83,54 @@  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;
 	cfg_val = readl(gamma->regs + DISP_GAMMA_CFG);
 	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, gamma->data->lut_bits);
-		hwlut.green = drm_color_lut_extract(lut[i].green, gamma->data->lut_bits);
-		hwlut.blue = drm_color_lut_extract(lut[i].blue, gamma->data->lut_bits);
-
-		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, gamma->data->lut_bits);
-
-			diff.green = lut[i].green - lut[i - 1].green;
-			diff.green = drm_color_lut_extract(diff.green, gamma->data->lut_bits);
-
-			diff.blue = lut[i].blue - lut[i - 1].blue;
-			diff.blue = drm_color_lut_extract(diff.blue, gamma->data->lut_bits);
-
-			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, gamma->data->lut_bits);
+			hwlut.green = drm_color_lut_extract(lut[n].green, gamma->data->lut_bits);
+			hwlut.blue = drm_color_lut_extract(lut[n].blue, gamma->data->lut_bits);
+
+			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, gamma->data->lut_bits);
+
+				diff.green = lut[n].green - lut[n - 1].green;
+				diff.green = drm_color_lut_extract(diff.green, gamma->data->lut_bits);
+
+				diff.blue = lut[n].blue - lut[n - 1].blue;
+				diff.blue = drm_color_lut_extract(diff.blue, gamma->data->lut_bits);
+
+				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));
 	}
 
 	/* Enable the gamma table */
@@ -218,11 +234,13 @@  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_bank_size = 512,
 	.lut_bits = 10,
 	.lut_size = 512,
 };
 
 static const struct mtk_disp_gamma_data mt8183_gamma_driver_data = {
+	.lut_bank_size = 512,
 	.lut_bits = 10,
 	.lut_diff = true,
 	.lut_size = 512,