drm/rockchip: dsi: fix mipi display can't found at init time

The problem is that:
  mipi panel probe request mipi_dsi_host_register.
  mipi host attach is call from panel device, so the defer function
always can't works.

So at the first bind time, always can't found mipi panel.

Change-Id: Ic95eeb4876896ea93860d8baaae074f50f078c62
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>

diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
index 856804cd488b8d31ec5988c477e583159fba0c97..6115e81dbfb732e6bcebb88a0cd02e20331cd850 100644 (file)
--- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c
@@ -553,11 +553,9 @@ static int dw_mipi_dsi_host_attach(struct mipi_dsi_host *host,
        dsi->panel = of_drm_find_panel(device->dev.of_node);
        if (!dsi->panel) {
                DRM_ERROR("failed to find panel\n");
-               return -EPROBE_DEFER;
+               return -ENODEV;
        }
 
-       drm_panel_attach(dsi->panel, &dsi->connector);
-
        return 0;
 }
 
@@ -569,6 +567,7 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host,
        if (dsi->panel)
                drm_panel_detach(dsi->panel);
 
+       dsi->panel = NULL;
        return 0;
 }
 
@@ -1089,7 +1088,10 @@ static int dw_mipi_dsi_register(struct drm_device *drm,
                           &dw_mipi_dsi_atomic_connector_funcs,
                           DRM_MODE_CONNECTOR_DSI);
 
+       drm_panel_attach(dsi->panel, &dsi->connector);
+
        dsi->connector.port = dev->of_node;
+
        drm_mode_connector_attach_encoder(connector, encoder);
 
        return 0;
@@ -1139,23 +1141,17 @@ MODULE_DEVICE_TABLE(of, dw_mipi_dsi_dt_ids);
 static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
                             void *data)
 {
-       const struct of_device_id *of_id =
-                       of_match_device(dw_mipi_dsi_dt_ids, dev);
-       const struct dw_mipi_dsi_plat_data *pdata = of_id->data;
        struct platform_device *pdev = to_platform_device(dev);
        struct drm_device *drm = data;
-       struct dw_mipi_dsi *dsi;
+       struct dw_mipi_dsi *dsi = dev_get_drvdata(dev);
        struct resource *res;
        int ret;
 
-       dsi = devm_kzalloc(dev, sizeof(*dsi), GFP_KERNEL);
-       if (!dsi)
-               return -ENOMEM;
-
-       dsi->dev = dev;
-       dsi->pdata = pdata;
        dsi->dpms_mode = DRM_MODE_DPMS_OFF;
 
+       if (!dsi->panel)
+               return -EPROBE_DEFER;
+
        ret = rockchip_mipi_parse_dt(dsi);
        if (ret)
                return ret;
@@ -1202,9 +1198,7 @@ static int dw_mipi_dsi_bind(struct device *dev, struct device *master,
 
        pm_runtime_enable(dev);
 
-       dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
-       dsi->dsi_host.dev = dev;
-       return mipi_dsi_host_register(&dsi->dsi_host);
+       return 0;
 
 err_pllref:
        clk_disable_unprepare(dsi->pllref_clk);
@@ -1216,7 +1210,6 @@ static void dw_mipi_dsi_unbind(struct device *dev, struct device *master,
 {
        struct dw_mipi_dsi *dsi = dev_get_drvdata(dev);
 
-       mipi_dsi_host_unregister(&dsi->dsi_host);
        pm_runtime_disable(dev);
        clk_disable_unprepare(dsi->pllref_clk);
 }
@@ -1228,11 +1221,40 @@ static const struct component_ops dw_mipi_dsi_ops = {
 
 static int dw_mipi_dsi_probe(struct platform_device *pdev)
 {
-       return component_add(&pdev->dev, &dw_mipi_dsi_ops);
+       struct device *dev = &pdev->dev;
+       const struct of_device_id *of_id =
+                       of_match_device(dw_mipi_dsi_dt_ids, dev);
+       const struct dw_mipi_dsi_plat_data *pdata = of_id->data;
+       struct dw_mipi_dsi *dsi;
+       int ret;
+
+       dsi = devm_kzalloc(&pdev->dev, sizeof(*dsi), GFP_KERNEL);
+       if (!dsi)
+               return -ENOMEM;
+
+       dsi->dev = dev;
+       dsi->pdata = pdata;
+       dsi->dsi_host.ops = &dw_mipi_dsi_host_ops;
+       dsi->dsi_host.dev = &pdev->dev;
+
+       ret = mipi_dsi_host_register(&dsi->dsi_host);
+       if (ret)
+               return ret;
+
+       platform_set_drvdata(pdev, dsi);
+       ret = component_add(&pdev->dev, &dw_mipi_dsi_ops);
+       if (ret)
+               mipi_dsi_host_unregister(&dsi->dsi_host);
+
+       return ret;
 }
 
 static int dw_mipi_dsi_remove(struct platform_device *pdev)
 {
+       struct dw_mipi_dsi *dsi = dev_get_drvdata(&pdev->dev);
+
+       if (dsi)
+               mipi_dsi_host_unregister(&dsi->dsi_host);
        component_del(&pdev->dev, &dw_mipi_dsi_ops);
        return 0;
 }