drm/mediatek: move mipi_dsi_host_register to probe

DSI panel driver need attach function which is include in
mipi_dsi_host_ops.

If mipi_dsi_host_register is not in probe, dsi panel will
probe more delay.

So move the mipi_dsi_host_register to probe from bind.

Signed-off-by: Jitao Shi <jitao.shi@mediatek.com>
Signed-off-by: CK Hu <ck.hu@mediatek.com>

diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c
index 224afb666881c496e11343c8c9264917d3291154..a696509aac90c560e36bf2a54011e2fd17861af8 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_dsi.c
+++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -522,7 +522,7 @@ static s32 mtk_dsi_switch_to_cmd_mode(struct mtk_dsi *dsi, u8 irq_flag, u32 t)
 
 static int mtk_dsi_poweron(struct mtk_dsi *dsi)
 {
-       struct device *dev = dsi->dev;
+       struct device *dev = dsi->host.dev;
        int ret;
        u64 pixel_clock, total_bits;
        u32 htotal, htotal_bits, bit_per_pixel, overhead_cycles, overhead_bits;
@@ -1049,12 +1049,6 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
                return ret;
        }
 
-       ret = mipi_dsi_host_register(&dsi->host);
-       if (ret < 0) {
-               dev_err(dev, "failed to register DSI host: %d\n", ret);
-               goto err_ddp_comp_unregister;
-       }
-
        ret = mtk_dsi_create_conn_enc(drm, dsi);
        if (ret) {
                DRM_ERROR("Encoder create failed with %d\n", ret);
@@ -1064,8 +1058,6 @@ static int mtk_dsi_bind(struct device *dev, struct device *master, void *data)
        return 0;
 
 err_unregister:
-       mipi_dsi_host_unregister(&dsi->host);
-err_ddp_comp_unregister:
        mtk_ddp_comp_unregister(drm, &dsi->ddp_comp);
        return ret;
 }
@@ -1077,7 +1069,6 @@ static void mtk_dsi_unbind(struct device *dev, struct device *master,
        struct mtk_dsi *dsi = dev_get_drvdata(dev);
 
        mtk_dsi_destroy_conn_enc(dsi);
-       mipi_dsi_host_unregister(&dsi->host);
        mtk_ddp_comp_unregister(drm, &dsi->ddp_comp);
 }
 
@@ -1101,31 +1092,36 @@ static int mtk_dsi_probe(struct platform_device *pdev)
 
        dsi->host.ops = &mtk_dsi_ops;
        dsi->host.dev = dev;
+       ret = mipi_dsi_host_register(&dsi->host);
+       if (ret < 0) {
+               dev_err(dev, "failed to register DSI host: %d\n", ret);
+               return ret;
+       }
 
        ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
                                          &dsi->panel, &dsi->bridge);
        if (ret)
-               return ret;
+               goto err_unregister_host;
 
        dsi->engine_clk = devm_clk_get(dev, "engine");
        if (IS_ERR(dsi->engine_clk)) {
                ret = PTR_ERR(dsi->engine_clk);
                dev_err(dev, "Failed to get engine clock: %d\n", ret);
-               return ret;
+               goto err_unregister_host;
        }
 
        dsi->digital_clk = devm_clk_get(dev, "digital");
        if (IS_ERR(dsi->digital_clk)) {
                ret = PTR_ERR(dsi->digital_clk);
                dev_err(dev, "Failed to get digital clock: %d\n", ret);
-               return ret;
+               goto err_unregister_host;
        }
 
        dsi->hs_clk = devm_clk_get(dev, "hs");
        if (IS_ERR(dsi->hs_clk)) {
                ret = PTR_ERR(dsi->hs_clk);
                dev_err(dev, "Failed to get hs clock: %d\n", ret);
-               return ret;
+               goto err_unregister_host;
        }
 
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -1133,33 +1129,35 @@ static int mtk_dsi_probe(struct platform_device *pdev)
        if (IS_ERR(dsi->regs)) {
                ret = PTR_ERR(dsi->regs);
                dev_err(dev, "Failed to ioremap memory: %d\n", ret);
-               return ret;
+               goto err_unregister_host;
        }
 
        dsi->phy = devm_phy_get(dev, "dphy");
        if (IS_ERR(dsi->phy)) {
                ret = PTR_ERR(dsi->phy);
                dev_err(dev, "Failed to get MIPI-DPHY: %d\n", ret);
-               return ret;
+               goto err_unregister_host;
        }
 
        comp_id = mtk_ddp_comp_get_id(dev->of_node, MTK_DSI);
        if (comp_id < 0) {
                dev_err(dev, "Failed to identify by alias: %d\n", comp_id);
-               return comp_id;
+               ret = comp_id;
+               goto err_unregister_host;
        }
 
        ret = mtk_ddp_comp_init(dev, dev->of_node, &dsi->ddp_comp, comp_id,
                                &mtk_dsi_funcs);
        if (ret) {
                dev_err(dev, "Failed to initialize component: %d\n", ret);
-               return ret;
+               goto err_unregister_host;
        }
 
        irq_num = platform_get_irq(pdev, 0);
        if (irq_num < 0) {
-               dev_err(&pdev->dev, "failed to request dsi irq resource\n");
-               return -EPROBE_DEFER;
+               dev_err(&pdev->dev, "failed to get dsi irq_num: %d\n", irq_num);
+               ret = irq_num;
+               goto err_unregister_host;
        }
 
        irq_set_status_flags(irq_num, IRQ_TYPE_LEVEL_LOW);
@@ -1167,14 +1165,24 @@ static int mtk_dsi_probe(struct platform_device *pdev)
                               IRQF_TRIGGER_LOW, dev_name(&pdev->dev), dsi);
        if (ret) {
                dev_err(&pdev->dev, "failed to request mediatek dsi irq\n");
-               return -EPROBE_DEFER;
+               goto err_unregister_host;
        }
 
        init_waitqueue_head(&dsi->irq_wait_queue);
 
        platform_set_drvdata(pdev, dsi);
 
-       return component_add(&pdev->dev, &mtk_dsi_component_ops);
+       ret = component_add(&pdev->dev, &mtk_dsi_component_ops);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to add component: %d\n", ret);
+               goto err_unregister_host;
+       }
+
+       return 0;
+
+err_unregister_host:
+       mipi_dsi_host_unregister(&dsi->host);
+       return ret;
 }
 
 static int mtk_dsi_remove(struct platform_device *pdev)
@@ -1183,6 +1191,7 @@ static int mtk_dsi_remove(struct platform_device *pdev)
 
        mtk_output_dsi_disable(dsi);
        component_del(&pdev->dev, &mtk_dsi_component_ops);
+       mipi_dsi_host_unregister(&dsi->host);
 
        return 0;
 }