Hi, Frank:

Frank Wunderlich frank-w@public-files.de 於 2020年7月28日 週二 下午7:18寫道：

From: Bibby Hsieh bibby.hsieh@mediatek.com

We can select output component by decive node port. Main path default output component is DSI. External path default output component is DPI.

without this Patch i get this warning:

WARNING: CPU: 3 PID: 70 at drivers/gpu/drm/drm_mode_config.c:621 drm_mode_config_validate+0x1d8/0x258

Signed-off-by: Bibby Hsieh bibby.hsieh@mediatek.com

added small fixes for warnings

Signed-off-by: Frank Wunderlich frank-w@public-files.de Tested-by: Frank Wunderlich frank-w@public-files.de

---

[snip]

-static const enum mtk_ddp_comp_id mt8173_mtk_ddp_ext[] = { +static enum mtk_ddp_comp_id mt8173_mtk_ddp_ext[] = { DDP_COMPONENT_OVL1, DDP_COMPONENT_COLOR1, DDP_COMPONENT_GAMMA, @@ -459,6 +466,7 @@ static int mtk_drm_probe(struct platform_device *pdev)

    /* Iterate over sibling DISP function blocks */
    for_each_child_of_node(phandle->parent, node) {

•           struct device_node *port, *ep, *remote;
            const struct of_device_id *of_id;
            enum mtk_ddp_comp_type comp_type;
            int comp_id;
  

@@ -522,6 +530,32 @@ static int mtk_drm_probe(struct platform_device *pdev)

                    private->ddp_comp[comp_id] = comp;
            }

•           if (comp_type != MTK_DSI && comp_type != MTK_DPI) {
  

•                   port = of_graph_get_port_by_id(node, 0);
  

•                   if (!port)
  

•                           continue;
  

•                   ep = of_get_child_by_name(port, "endpoint");
  

•                   of_node_put(port);
  

•                   if (!ep)
  

•                           continue;
  

•                   remote = of_graph_get_remote_port_parent(ep);
  

•                   of_node_put(ep);
  

•                   if (!remote)
  

•                           continue;
  

•                   of_id = of_match_node(mtk_ddp_comp_dt_ids, remote);
  

•                   if (!of_id)
  

•                           continue;
  

•                   comp_type = (enum mtk_ddp_comp_type)of_id->data;
  

•                   for (i = 0; i < private->data->main_len - 1; i++)
  

•                           if (private->data->main_path[i] == comp_id)
  

•                                   private->data->main_path[i + 1] =
  

•                                   mtk_ddp_comp_get_id(node, comp_type);
  

•                   for (i = 0; i < private->data->ext_len - 1; i++)
  

•                           if (private->data->ext_path[i] == comp_id)
  

•                                   private->data->ext_path[i + 1] =
  

•                                   mtk_ddp_comp_get_id(node, comp_type);
  

•           }
  

The port property is not defined in binding document [1], so define it in binding document first.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Docu...

Regards, Chun-Kuang.

    }

    if (!private->mutex_node) {

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h index b5be63e53176..7fcaab648bf1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h @@ -21,9 +21,9 @@ struct drm_property; struct regmap;

struct mtk_mmsys_driver_data {

•   const enum mtk_ddp_comp_id *main_path;
  

•   enum mtk_ddp_comp_id *main_path;
    unsigned int main_len;
  

•   const enum mtk_ddp_comp_id *ext_path;
  

•   enum mtk_ddp_comp_id *ext_path;
    unsigned int ext_len;
    const enum mtk_ddp_comp_id *third_path;
    unsigned int third_len;
  

-- 2.25.1

Hi, Frank:

Frank Wunderlich frank-w@public-files.de 於 2020年7月28日 週二 下午7:19寫道：

From: chunhui dai chunhui.dai@mediatek.com

• disable tmds on phy on mt2701
• support other resolutions like 1280x1024

If this patch does two things, it should be broken into two patches.

without this Patch i see flickering on my TFT (1280x1024), so i guess clock is wrong.

Signed-off-by: chunhui dai chunhui.dai@mediatek.com Signed-off-by: Frank Wunderlich frank-w@public-files.de Tested-by: Frank Wunderlich frank-w@public-files.de

---

drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 3 +++ drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 1 + drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 1 + 3 files changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c index 5223498502c4..edadb7a700f1 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c @@ -184,6 +184,9 @@ static int mtk_hdmi_phy_probe(struct platform_device *pdev) return PTR_ERR(phy_provider); }

•   if (hdmi_phy->conf->pll_default_off)
  

•           hdmi_phy->conf->hdmi_phy_disable_tmds(hdmi_phy);
  

I think every pll is default off, so you should turn on pll rather than disable tmds.

Regards, Chun-Kuang.

•   return of_clk_add_provider(dev->of_node, of_clk_src_simple_get,
                               hdmi_phy->pll);
  

} diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h index 2d8b3182470d..f472fdeb63dc 100644 --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h @@ -22,6 +22,7 @@ struct mtk_hdmi_phy; struct mtk_hdmi_phy_conf { bool tz_disabled; unsigned long flags;

•   bool pll_default_off;
    const struct clk_ops *hdmi_phy_clk_ops;
    void (*hdmi_phy_enable_tmds)(struct mtk_hdmi_phy *hdmi_phy);
    void (*hdmi_phy_disable_tmds)(struct mtk_hdmi_phy *hdmi_phy);
  

diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c index d3cc4022e988..6fbedacfc1e8 100644 --- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c +++ b/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c @@ -239,6 +239,7 @@ static void mtk_hdmi_phy_disable_tmds(struct mtk_hdmi_phy *hdmi_phy) struct mtk_hdmi_phy_conf mtk_hdmi_phy_2701_conf = { .tz_disabled = true, .flags = CLK_SET_RATE_GATE,

•   .pll_default_off = true,
    .hdmi_phy_clk_ops = &mtk_hdmi_phy_pll_ops,
    .hdmi_phy_enable_tmds = mtk_hdmi_phy_enable_tmds,
    .hdmi_phy_disable_tmds = mtk_hdmi_phy_disable_tmds,
  

-- 2.25.1

Hi, Frank:

Frank Wunderlich frank-w@public-files.de 於 2020年7月28日 週二 下午7:18寫道：

Describe why need this patch. I think the reason is:

For current mediatek dsi encoder, its possible crtc is fixed in crtc 0, and mediatek dpi encoder's possible crtc is fixed in crtc 1. In some SoC the possible crtc is not fixed in this case, so search pipeline information to find out the correct possible crtc.

From: Stu Hsieh stu.hsieh@mediatek.com

Test: build pass and run ok

Signed-off-by: Stu Hsieh stu.hsieh@mediatek.com

Need your signed-off-by tag.

---

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 42 +++++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 2 + 2 files changed, 44 insertions(+)

diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index 57c88de9a329..a5f2ff6bea93 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -13,6 +13,8 @@ #include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/soc/mediatek/mtk-cmdq.h> +#include <drm/drm_print.h>

#include "mtk_drm_drv.h" #include "mtk_drm_plane.h" #include "mtk_drm_ddp_comp.h" @@ -412,6 +414,22 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_ID_MAX] = { [DDP_COMPONENT_WDMA1] = { MTK_DISP_WDMA, 1, NULL }, };

+static bool mtk_drm_find_comp_in_ddp(struct mtk_ddp_comp ddp_comp,

•                                    const enum mtk_ddp_comp_id *path,
  

•                                    unsigned int path_len)
  

+{

•   unsigned int i;
  

•   if (path == NULL)
  

•           return false;
  

This checking is redundant, so remove it.

•   for (i = 0U; i < path_len; i++)
  

•           if (ddp_comp.id == path[i])
  

•                   return true;
  

•   return false;
  

+}

int mtk_ddp_comp_get_id(struct device_node *node, enum mtk_ddp_comp_type comp_type) { @@ -427,6 +445,30 @@ int mtk_ddp_comp_get_id(struct device_node *node, return -EINVAL; }

+unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,

•                                           struct mtk_ddp_comp ddp_comp)
  

+{

•   struct mtk_drm_private *private = drm->dev_private;
  

•   unsigned int ret;
  

•   if (mtk_drm_find_comp_in_ddp(ddp_comp, private->data->main_path,
  

•           private->data->main_len) == true) {
  

' == true' is redundant, so remove it.

•           ret = BIT(0);
  

•   } else if (mtk_drm_find_comp_in_ddp(ddp_comp,
  

•           private->data->ext_path,
  

•           private->data->ext_len) == true) {
  

Ditto.

•           ret = BIT(1);
  

•   } else if (mtk_drm_find_comp_in_ddp(ddp_comp,
  

•           private->data->third_path,
  

•           private->data->third_len) == true) {
  

Ditto.

•           ret = BIT(2);
  

•   } else {
  

•           DRM_INFO("Failed to find comp in ddp table\n");
  

•           ret = 0;
  

•   }
  

•   return ret;
  

+}

int mtk_ddp_comp_init(struct device *dev, struct device_node *node, struct mtk_ddp_comp *comp, enum mtk_ddp_comp_id comp_id, const struct mtk_ddp_comp_funcs *funcs) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h index debe36395fe7..1d9e00b69462 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h @@ -202,6 +202,8 @@ static inline void mtk_ddp_ctm_set(struct mtk_ddp_comp *comp,

int mtk_ddp_comp_get_id(struct device_node *node, enum mtk_ddp_comp_type comp_type); +unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,

•                                           struct mtk_ddp_comp ddp_comp);
  

int mtk_ddp_comp_init(struct device *dev, struct device_node *comp_node, struct mtk_ddp_comp *comp, enum mtk_ddp_comp_id comp_id, const struct mtk_ddp_comp_funcs *funcs); -- 2.25.1

Hi, Frank:

Frank Wunderlich frank-w@public-files.de 於 2020年7月28日 週二 下午7:18寫道：

From: Jitao Shi jitao.shi@mediatek.com

[Detail] dpi/dsi get the possible_crtc by mtk_drm_find_possible_crtc_by_comp(*drm_dev, ddp_comp)

I would like more information of why do this patch. For example:

For current mediatek dsi encoder, its possible crtc is fixed in crtc 0, and mediatek dpi encoder's possible crtc is fixed in crtc 1. In some SoC the possible crtc is not fixed in this case, so call mtk_drm_find_possible_crtc_by_comp() to find out the correct possible crtc.

Regards, Chun-Kuang.

Test: build pass and boot to logo

Signed-off-by: Jitao Shi jitao.shi@mediatek.com

drivers/gpu/drm/mediatek/mtk_dpi.c | 3 ++- drivers/gpu/drm/mediatek/mtk_dsi.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index d4f0fb7ad312..e43977015843 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c @@ -608,7 +608,8 @@ static int mtk_dpi_bind(struct device *dev, struct device *master, void *data) drm_encoder_helper_add(&dpi->encoder, &mtk_dpi_encoder_helper_funcs);

    /* Currently DPI0 is fixed to be driven by OVL1 */

•   dpi->encoder.possible_crtcs = BIT(1);
  

•   dpi->encoder.possible_crtcs =
  

•           mtk_drm_find_possible_crtc_by_comp(drm_dev, dpi->ddp_comp);
  
    ret = drm_bridge_attach(&dpi->encoder, dpi->bridge, NULL, 0);
    if (ret) {
  

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index 270bf22c98fe..c31d9c12d4a9 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c @@ -892,7 +892,8 @@ static int mtk_dsi_create_conn_enc(struct drm_device *drm, struct mtk_dsi *dsi) * Currently display data paths are statically assigned to a crtc each. * crtc 0 is OVL0 -> COLOR0 -> AAL -> OD -> RDMA0 -> UFOE -> DSI0 */

•   dsi->encoder.possible_crtcs = 1;
  

•   dsi->encoder.possible_crtcs =
  

•           mtk_drm_find_possible_crtc_by_comp(drm, dsi->ddp_comp);
  
    /* If there's a bridge, attach to it and let it create the connector */
    if (dsi->bridge) {
  

-- 2.25.1