1. Patchew
  2. linux
  3. [PATCH v8 0/19] drm/mediatek: Add mt8195 DisplayPort driver
  4. View patch

[PATCH v8 08/19] drm/mediatek: dpi: move dimension mask to board config

Guillaume Ranquet posted 19 patches 3 years, 11 months ago
There is a newer version of this series
[PATCH v8 08/19] drm/mediatek: dpi: move dimension mask to board config
Posted by Guillaume Ranquet 3 years, 11 months ago 
Add flexibility by moving the dimension mask to the board config

Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
---
 drivers/gpu/drm/mediatek/mtk_dpi.c | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 454f8563efae4..8ca3455ed64ee 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -127,6 +127,8 @@ struct mtk_dpi_conf {
 	u32 num_output_fmts;
 	bool is_ck_de_pol;
 	bool swap_input_support;
+	// Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift)
+	u32 dimension_mask;
 	const struct mtk_dpi_yc_limit *limit;
 };
 
@@ -156,30 +158,30 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi)
 static void mtk_dpi_config_hsync(struct mtk_dpi *dpi,
 				 struct mtk_dpi_sync_param *sync)
 {
-	mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH,
-		     sync->sync_width << HPW, HPW_MASK);
-	mtk_dpi_mask(dpi, DPI_TGEN_HPORCH,
-		     sync->back_porch << HBP, HBP_MASK);
+	mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH, sync->sync_width << HPW,
+		     dpi->conf->dimension_mask << HPW);
+	mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->back_porch << HBP,
+		     dpi->conf->dimension_mask << HBP);
 	mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->front_porch << HFP,
-		     HFP_MASK);
+		     dpi->conf->dimension_mask << HFP);
 }
 
 static void mtk_dpi_config_vsync(struct mtk_dpi *dpi,
 				 struct mtk_dpi_sync_param *sync,
 				 u32 width_addr, u32 porch_addr)
 {
-	mtk_dpi_mask(dpi, width_addr,
-		     sync->sync_width << VSYNC_WIDTH_SHIFT,
-		     VSYNC_WIDTH_MASK);
 	mtk_dpi_mask(dpi, width_addr,
 		     sync->shift_half_line << VSYNC_HALF_LINE_SHIFT,
 		     VSYNC_HALF_LINE_MASK);
+	mtk_dpi_mask(dpi, width_addr,
+		     sync->sync_width << VSYNC_WIDTH_SHIFT,
+		     dpi->conf->dimension_mask << VSYNC_WIDTH_SHIFT);
 	mtk_dpi_mask(dpi, porch_addr,
 		     sync->back_porch << VSYNC_BACK_PORCH_SHIFT,
-		     VSYNC_BACK_PORCH_MASK);
+		     dpi->conf->dimension_mask << VSYNC_BACK_PORCH_SHIFT);
 	mtk_dpi_mask(dpi, porch_addr,
 		     sync->front_porch << VSYNC_FRONT_PORCH_SHIFT,
-		     VSYNC_FRONT_PORCH_MASK);
+		     dpi->conf->dimension_mask << VSYNC_FRONT_PORCH_SHIFT);
 }
 
 static void mtk_dpi_config_vsync_lodd(struct mtk_dpi *dpi,
@@ -813,6 +815,7 @@ static const struct mtk_dpi_conf mt8173_conf = {
 	.num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
 	.is_ck_de_pol = true,
 	.swap_input_support = true,
+	.dimension_mask = HPW_MASK,
 	.limit = &mtk_dpi_limit,
 };
 
@@ -825,6 +828,7 @@ static const struct mtk_dpi_conf mt2701_conf = {
 	.num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
 	.is_ck_de_pol = true,
 	.swap_input_support = true,
+	.dimension_mask = HPW_MASK,
 	.limit = &mtk_dpi_limit,
 };
 
@@ -836,6 +840,7 @@ static const struct mtk_dpi_conf mt8183_conf = {
 	.num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),
 	.is_ck_de_pol = true,
 	.swap_input_support = true,
+	.dimension_mask = HPW_MASK,
 	.limit = &mtk_dpi_limit,
 };
 
@@ -847,6 +852,7 @@ static const struct mtk_dpi_conf mt8192_conf = {
 	.num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
 	.is_ck_de_pol = true,
 	.swap_input_support = true,
+	.dimension_mask = HPW_MASK,
 	.limit = &mtk_dpi_limit,
 };
 
-- 
2.34.1
Re: [PATCH v8 08/19] drm/mediatek: dpi: move dimension mask to board config
Posted by AngeloGioacchino Del Regno 3 years, 11 months ago 
Il 18/02/22 15:54, Guillaume Ranquet ha scritto:
> Add flexibility by moving the dimension mask to the board config
> 

s/board/SoC/g


> Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
> ---
>   drivers/gpu/drm/mediatek/mtk_dpi.c | 26 ++++++++++++++++----------
>   1 file changed, 16 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index 454f8563efae4..8ca3455ed64ee 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -127,6 +127,8 @@ struct mtk_dpi_conf {
>   	u32 num_output_fmts;
>   	bool is_ck_de_pol;
>   	bool swap_input_support;
> +	// Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift)

Also, C-style comments, please.

After the change,
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>



> +	u32 dimension_mask;
>   	const struct mtk_dpi_yc_limit *limit;
>   };
>
Re: [PATCH v8 08/19] drm/mediatek: dpi: move dimension mask to board config
Posted by Chun-Kuang Hu 3 years, 11 months ago 
HI, Guillaume:

Guillaume Ranquet <granquet@baylibre.com> 於 2022年2月18日 週五 下午10:56寫道：
>
> Add flexibility by moving the dimension mask to the board config

After change 'board' to 'SoC',

Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>

>
> Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
> ---
>  drivers/gpu/drm/mediatek/mtk_dpi.c | 26 ++++++++++++++++----------
>  1 file changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index 454f8563efae4..8ca3455ed64ee 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -127,6 +127,8 @@ struct mtk_dpi_conf {
>         u32 num_output_fmts;
>         bool is_ck_de_pol;
>         bool swap_input_support;
> +       // Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift)
> +       u32 dimension_mask;
>         const struct mtk_dpi_yc_limit *limit;
>  };
>
> @@ -156,30 +158,30 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi)
>  static void mtk_dpi_config_hsync(struct mtk_dpi *dpi,
>                                  struct mtk_dpi_sync_param *sync)
>  {
> -       mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH,
> -                    sync->sync_width << HPW, HPW_MASK);
> -       mtk_dpi_mask(dpi, DPI_TGEN_HPORCH,
> -                    sync->back_porch << HBP, HBP_MASK);
> +       mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH, sync->sync_width << HPW,
> +                    dpi->conf->dimension_mask << HPW);
> +       mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->back_porch << HBP,
> +                    dpi->conf->dimension_mask << HBP);
>         mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->front_porch << HFP,
> -                    HFP_MASK);
> +                    dpi->conf->dimension_mask << HFP);
>  }
>
>  static void mtk_dpi_config_vsync(struct mtk_dpi *dpi,
>                                  struct mtk_dpi_sync_param *sync,
>                                  u32 width_addr, u32 porch_addr)
>  {
> -       mtk_dpi_mask(dpi, width_addr,
> -                    sync->sync_width << VSYNC_WIDTH_SHIFT,
> -                    VSYNC_WIDTH_MASK);
>         mtk_dpi_mask(dpi, width_addr,
>                      sync->shift_half_line << VSYNC_HALF_LINE_SHIFT,
>                      VSYNC_HALF_LINE_MASK);
> +       mtk_dpi_mask(dpi, width_addr,
> +                    sync->sync_width << VSYNC_WIDTH_SHIFT,
> +                    dpi->conf->dimension_mask << VSYNC_WIDTH_SHIFT);
>         mtk_dpi_mask(dpi, porch_addr,
>                      sync->back_porch << VSYNC_BACK_PORCH_SHIFT,
> -                    VSYNC_BACK_PORCH_MASK);
> +                    dpi->conf->dimension_mask << VSYNC_BACK_PORCH_SHIFT);
>         mtk_dpi_mask(dpi, porch_addr,
>                      sync->front_porch << VSYNC_FRONT_PORCH_SHIFT,
> -                    VSYNC_FRONT_PORCH_MASK);
> +                    dpi->conf->dimension_mask << VSYNC_FRONT_PORCH_SHIFT);
>  }
>
>  static void mtk_dpi_config_vsync_lodd(struct mtk_dpi *dpi,
> @@ -813,6 +815,7 @@ static const struct mtk_dpi_conf mt8173_conf = {
>         .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
>         .is_ck_de_pol = true,
>         .swap_input_support = true,
> +       .dimension_mask = HPW_MASK,
>         .limit = &mtk_dpi_limit,
>  };
>
> @@ -825,6 +828,7 @@ static const struct mtk_dpi_conf mt2701_conf = {
>         .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
>         .is_ck_de_pol = true,
>         .swap_input_support = true,
> +       .dimension_mask = HPW_MASK,
>         .limit = &mtk_dpi_limit,
>  };
>
> @@ -836,6 +840,7 @@ static const struct mtk_dpi_conf mt8183_conf = {
>         .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),
>         .is_ck_de_pol = true,
>         .swap_input_support = true,
> +       .dimension_mask = HPW_MASK,
>         .limit = &mtk_dpi_limit,
>  };
>
> @@ -847,6 +852,7 @@ static const struct mtk_dpi_conf mt8192_conf = {
>         .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
>         .is_ck_de_pol = true,
>         .swap_input_support = true,
> +       .dimension_mask = HPW_MASK,
>         .limit = &mtk_dpi_limit,
>  };
>
> --
> 2.34.1
>
Re: [PATCH v8 08/19] drm/mediatek: dpi: move dimension mask to board config
Posted by Chun-Kuang Hu 3 years, 11 months ago 
Hi, Guillaume:

Chun-Kuang Hu <chunkuang.hu@kernel.org> 於 2022年2月21日 週一 上午10:40寫道：
>
> HI, Guillaume:
>
> Guillaume Ranquet <granquet@baylibre.com> 於 2022年2月18日 週五 下午10:56寫道：
> >
> > Add flexibility by moving the dimension mask to the board config
>
> After change 'board' to 'SoC',
>
> Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
>
> >
> > Signed-off-by: Guillaume Ranquet <granquet@baylibre.com>
> > ---
> >  drivers/gpu/drm/mediatek/mtk_dpi.c | 26 ++++++++++++++++----------
> >  1 file changed, 16 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > index 454f8563efae4..8ca3455ed64ee 100644
> > --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> > +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> > @@ -127,6 +127,8 @@ struct mtk_dpi_conf {
> >         u32 num_output_fmts;
> >         bool is_ck_de_pol;
> >         bool swap_input_support;
> > +       // Mask used for HWIDTH, HPORCH, VSYNC_WIDTH and VSYNC_PORCH (no shift)

Sorry, this should be /* ... */

Regards,
Chun-Kuang.

> > +       u32 dimension_mask;
> >         const struct mtk_dpi_yc_limit *limit;
> >  };
> >
> > @@ -156,30 +158,30 @@ static void mtk_dpi_disable(struct mtk_dpi *dpi)
> >  static void mtk_dpi_config_hsync(struct mtk_dpi *dpi,
> >                                  struct mtk_dpi_sync_param *sync)
> >  {
> > -       mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH,
> > -                    sync->sync_width << HPW, HPW_MASK);
> > -       mtk_dpi_mask(dpi, DPI_TGEN_HPORCH,
> > -                    sync->back_porch << HBP, HBP_MASK);
> > +       mtk_dpi_mask(dpi, DPI_TGEN_HWIDTH, sync->sync_width << HPW,
> > +                    dpi->conf->dimension_mask << HPW);
> > +       mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->back_porch << HBP,
> > +                    dpi->conf->dimension_mask << HBP);
> >         mtk_dpi_mask(dpi, DPI_TGEN_HPORCH, sync->front_porch << HFP,
> > -                    HFP_MASK);
> > +                    dpi->conf->dimension_mask << HFP);
> >  }
> >
> >  static void mtk_dpi_config_vsync(struct mtk_dpi *dpi,
> >                                  struct mtk_dpi_sync_param *sync,
> >                                  u32 width_addr, u32 porch_addr)
> >  {
> > -       mtk_dpi_mask(dpi, width_addr,
> > -                    sync->sync_width << VSYNC_WIDTH_SHIFT,
> > -                    VSYNC_WIDTH_MASK);
> >         mtk_dpi_mask(dpi, width_addr,
> >                      sync->shift_half_line << VSYNC_HALF_LINE_SHIFT,
> >                      VSYNC_HALF_LINE_MASK);
> > +       mtk_dpi_mask(dpi, width_addr,
> > +                    sync->sync_width << VSYNC_WIDTH_SHIFT,
> > +                    dpi->conf->dimension_mask << VSYNC_WIDTH_SHIFT);
> >         mtk_dpi_mask(dpi, porch_addr,
> >                      sync->back_porch << VSYNC_BACK_PORCH_SHIFT,
> > -                    VSYNC_BACK_PORCH_MASK);
> > +                    dpi->conf->dimension_mask << VSYNC_BACK_PORCH_SHIFT);
> >         mtk_dpi_mask(dpi, porch_addr,
> >                      sync->front_porch << VSYNC_FRONT_PORCH_SHIFT,
> > -                    VSYNC_FRONT_PORCH_MASK);
> > +                    dpi->conf->dimension_mask << VSYNC_FRONT_PORCH_SHIFT);
> >  }
> >
> >  static void mtk_dpi_config_vsync_lodd(struct mtk_dpi *dpi,
> > @@ -813,6 +815,7 @@ static const struct mtk_dpi_conf mt8173_conf = {
> >         .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
> >         .is_ck_de_pol = true,
> >         .swap_input_support = true,
> > +       .dimension_mask = HPW_MASK,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > @@ -825,6 +828,7 @@ static const struct mtk_dpi_conf mt2701_conf = {
> >         .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
> >         .is_ck_de_pol = true,
> >         .swap_input_support = true,
> > +       .dimension_mask = HPW_MASK,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > @@ -836,6 +840,7 @@ static const struct mtk_dpi_conf mt8183_conf = {
> >         .num_output_fmts = ARRAY_SIZE(mt8183_output_fmts),
> >         .is_ck_de_pol = true,
> >         .swap_input_support = true,
> > +       .dimension_mask = HPW_MASK,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > @@ -847,6 +852,7 @@ static const struct mtk_dpi_conf mt8192_conf = {
> >         .num_output_fmts = ARRAY_SIZE(mt8173_output_fmts),
> >         .is_ck_de_pol = true,
> >         .swap_input_support = true,
> > +       .dimension_mask = HPW_MASK,
> >         .limit = &mtk_dpi_limit,
> >  };
> >
> > --
> > 2.34.1
> >

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.