Re: [PATCH v1 3/7] drm/mediatek: add dpi driver for mt2701 and mt7623

2018-05-28 Thread CK Hu 
Hi, Bibby:

On Mon, 2018-05-14 at 15:52 +0800, Bibby Hsieh wrote:
> From: chunhui dai 
> 
> This patch adds dpi driver suppot for both mt2701 and mt7623.
> And also support other (existing or future) chips that use
> the same binding and driver.
> 
> Signed-off-by: chunhui dai 
> ---
>  drivers/gpu/drm/mediatek/mtk_dpi.c | 24 ++--
>  drivers/gpu/drm/mediatek/mtk_drm_drv.c |  1 +
>  2 files changed, 23 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c 
> b/drivers/gpu/drm/mediatek/mtk_dpi.c
> index 2b8b34c72697..e1af1d0d213d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_dpi.c
> +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
> @@ -640,8 +640,7 @@ static int mtk_dpi_bind(struct device *dev, struct device 
> *master, void *data)
>   }
>   drm_encoder_helper_add(>encoder, _dpi_encoder_helper_funcs);
>  
> - /* Currently DPI0 is fixed to be driven by OVL1 */
> - dpi->encoder.possible_crtcs = BIT(1);
> + dpi->encoder.possible_crtcs = BIT(0) | BIT(1);

This modification influence not only mt2701, but also mt8173. So move
this to an independent patch.

Regards,
CK

>   dpi->encoder.bridge->encoder = >encoder;
>   ret = drm_bridge_attach(>encoder, dpi->encoder.bridge, NULL);
>   if (ret) {
> @@ -690,12 +689,33 @@ static unsigned int mt8173_calculate_factor(int clock)
>   return 2 * 3;
>  }
>  
> +static unsigned int mt2701_calculate_factor(int clock)
> +{
> + if (clock <= 64000)
> + return 16;
> + else if (clock <= 128000)
> + return 8;
> + else if (clock <= 256000)
> + return 4;
> + else
> + return 2;
> +}
> +
>  static const struct mtk_dpi_conf mt8173_conf = {
>   .cal_factor = mt8173_calculate_factor,
>   .reg_h_fre_con = 0xe0,
>  };
>  
> +static const struct mtk_dpi_conf mt2701_conf = {
> + .cal_factor = mt2701_calculate_factor,
> + .reg_h_fre_con = 0xb0,
> + .edge_sel_en = true,
> +};
> +
>  static const struct of_device_id mtk_dpi_of_ids[] = {
> + { .compatible = "mediatek,mt2701-dpi",
> +   .data = _conf,
> + },
>   { .compatible = "mediatek,mt8173-dpi",
> .data = _conf,
>   },
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c 
> b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> index a2ca90fc403c..f4fb86ab7b8d 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
> @@ -372,6 +372,7 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
>   { .compatible = "mediatek,mt8173-disp-ufoe",  .data = (void 
> *)MTK_DISP_UFOE },
>   { .compatible = "mediatek,mt2701-dsi",.data = (void *)MTK_DSI },
>   { .compatible = "mediatek,mt8173-dsi",.data = (void *)MTK_DSI },
> + { .compatible = "mediatek,mt2701-dpi",.data = (void *)MTK_DPI },
>   { .compatible = "mediatek,mt8173-dpi",.data = (void *)MTK_DPI },
>   { .compatible = "mediatek,mt2701-disp-mutex", .data = (void 
> *)MTK_DISP_MUTEX },
>   { .compatible = "mediatek,mt8173-disp-mutex", .data = (void 
> *)MTK_DISP_MUTEX },


___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH v1 3/7] drm/mediatek: add dpi driver for mt2701 and mt7623

2018-05-14 Thread Bibby Hsieh 
From: chunhui dai 

This patch adds dpi driver suppot for both mt2701 and mt7623.
And also support other (existing or future) chips that use
the same binding and driver.

Signed-off-by: chunhui dai 
---
 drivers/gpu/drm/mediatek/mtk_dpi.c | 24 ++--
 drivers/gpu/drm/mediatek/mtk_drm_drv.c |  1 +
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c 
b/drivers/gpu/drm/mediatek/mtk_dpi.c
index 2b8b34c72697..e1af1d0d213d 100644
--- a/drivers/gpu/drm/mediatek/mtk_dpi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -640,8 +640,7 @@ static int mtk_dpi_bind(struct device *dev, struct device 
*master, void *data)
}
drm_encoder_helper_add(>encoder, _dpi_encoder_helper_funcs);
 
-   /* Currently DPI0 is fixed to be driven by OVL1 */
-   dpi->encoder.possible_crtcs = BIT(1);
+   dpi->encoder.possible_crtcs = BIT(0) | BIT(1);
dpi->encoder.bridge->encoder = >encoder;
ret = drm_bridge_attach(>encoder, dpi->encoder.bridge, NULL);
if (ret) {
@@ -690,12 +689,33 @@ static unsigned int mt8173_calculate_factor(int clock)
return 2 * 3;
 }
 
+static unsigned int mt2701_calculate_factor(int clock)
+{
+   if (clock <= 64000)
+   return 16;
+   else if (clock <= 128000)
+   return 8;
+   else if (clock <= 256000)
+   return 4;
+   else
+   return 2;
+}
+
 static const struct mtk_dpi_conf mt8173_conf = {
.cal_factor = mt8173_calculate_factor,
.reg_h_fre_con = 0xe0,
 };
 
+static const struct mtk_dpi_conf mt2701_conf = {
+   .cal_factor = mt2701_calculate_factor,
+   .reg_h_fre_con = 0xb0,
+   .edge_sel_en = true,
+};
+
 static const struct of_device_id mtk_dpi_of_ids[] = {
+   { .compatible = "mediatek,mt2701-dpi",
+ .data = _conf,
+   },
{ .compatible = "mediatek,mt8173-dpi",
  .data = _conf,
},
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c 
b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
index a2ca90fc403c..f4fb86ab7b8d 100644
--- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -372,6 +372,7 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = {
{ .compatible = "mediatek,mt8173-disp-ufoe",  .data = (void 
*)MTK_DISP_UFOE },
{ .compatible = "mediatek,mt2701-dsi",.data = (void *)MTK_DSI },
{ .compatible = "mediatek,mt8173-dsi",.data = (void *)MTK_DSI },
+   { .compatible = "mediatek,mt2701-dpi",.data = (void *)MTK_DPI },
{ .compatible = "mediatek,mt8173-dpi",.data = (void *)MTK_DPI },
{ .compatible = "mediatek,mt2701-disp-mutex", .data = (void 
*)MTK_DISP_MUTEX },
{ .compatible = "mediatek,mt8173-disp-mutex", .data = (void 
*)MTK_DISP_MUTEX },
-- 
2.12.5

___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel