Skip to contentSkip to conversation

drm/msm: few small cleanups

PATCH New Rob Clark 5 participants 10 messages Jun 30, 2019 – Jul 11, 2019

Subsystems (4)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

cover drm/msm: few small cleanups

From: Rob Clark <[email protected]>

2 and 3 are some early prep-work to deal with bootloader enabled displays, where we want to avoid runpm get/put cycles until we know that we won't -EPROBE_DEFER. (Otherwise, it will kill the display, and it's not terribly nice to kill efifb and leave the user with no good way to debug what dependency they are missing.)

Rob Clark (3):
drm/msm: don't open-code governor name drm/msm/dpu: remove dpu_mdss:hwversion drm/msm/dsi: make sure we have panel or bridge earlier

 drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c |  5 ----
 drivers/gpu/drm/msm/dsi/dsi.h            |  2 +-
 drivers/gpu/drm/msm/dsi/dsi_host.c       | 30 ++++++++++++------------
 drivers/gpu/drm/msm/dsi/dsi_manager.c    |  9 +++----
 drivers/gpu/drm/msm/msm_gpu.c            |  2 +-
 5 files changed, 20 insertions(+), 28 deletions(-)
Signature · 6 lines
2.20.1

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
#1 lore raw

PATCH 1/3 drm/msm: don't open-code governor name

From: Rob Clark <[email protected]>

---
 drivers/gpu/drm/msm/msm_gpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gpu.c +1 -1
index 0a4c77fb3d94..e323259a16d3 100644
@@ -106,7 +106,7 @@ static void msm_devfreq_init(struct msm_gpu *gpu)
 	 */
 
 	gpu->devfreq.devfreq = devm_devfreq_add_device(&gpu->pdev->dev,
-			&msm_devfreq_profile, "simple_ondemand", NULL);
+			&msm_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
 
 	if (IS_ERR(gpu->devfreq.devfreq)) {
 		DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n");
Signature · 6 lines
2.20.1

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] drm/msm: don't open-code governor name

Quoted 1 line · Rob Clark

From: Rob Clark <[email protected]>

Quoted 25 lines
---
 drivers/gpu/drm/msm/msm_gpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/msm_gpu.c +1 -1
index 0a4c77fb3d94..e323259a16d3 100644
@@ -106,7 +106,7 @@ static void msm_devfreq_init(struct msm_gpu *gpu)
 	 */
 
 	gpu->devfreq.devfreq = devm_devfreq_add_device(&gpu->pdev->dev,
-			&msm_devfreq_profile, "simple_ondemand", NULL);
+			&msm_devfreq_profile, DEVFREQ_GOV_SIMPLE_ONDEMAND, NULL);
 
 	if (IS_ERR(gpu->devfreq.devfreq)) {
 		DRM_DEV_ERROR(&gpu->pdev->dev, "Couldn't initialize GPU devfreq\n");
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
#3 lore raw

PATCH 2/3 drm/msm/dpu: remove dpu_mdss:hwversion

In reply to Rob Clark

From: Rob Clark <[email protected]>

Unused and the extra rpm get/put interferes with handover from bootloader (ie. happens before we have a chance to check if things are already enabled).

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +0 -5
index 986915bbbc02..e83dd4c6ec58 100644
@@ -22,7 +22,6 @@ struct dpu_mdss {
 	struct msm_mdss base;
 	void __iomem *mmio;
 	unsigned long mmio_len;
-	u32 hwversion;
 	struct dss_module_power mp;
 	struct dpu_irq_controller irq_controller;
 	struct icc_path *path[2];
@@ -287,10 +286,6 @@ int dpu_mdss_init(struct drm_device *dev)
 
 	dpu_mdss_icc_request_bw(priv->mdss);
 
-	pm_runtime_get_sync(dev->dev);
-	dpu_mdss->hwversion = readl_relaxed(dpu_mdss->mmio);
-	pm_runtime_put_sync(dev->dev);
-
 	return ret;
 
 irq_error:
Signature · 6 lines
2.20.1

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Reviewed-by on v1 2/3
#4 lore raw

Re: [Freedreno] [PATCH 2/3] drm/msm/dpu: remove dpu_mdss:hwversion

Quoted 5 lines · Rob Clark

From: Rob Clark <[email protected]>

Unused and the extra rpm get/put interferes with handover from bootloader (ie. happens before we have a chance to check if things are already enabled).

Yay for not turning on the hardware before we need to.

Quoted 35 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +0 -5
index 986915bbbc02..e83dd4c6ec58 100644
@@ -22,7 +22,6 @@ struct dpu_mdss {
 	struct msm_mdss base;
 	void __iomem *mmio;
 	unsigned long mmio_len;
-	u32 hwversion;
 	struct dss_module_power mp;
 	struct dpu_irq_controller irq_controller;
 	struct icc_path *path[2];
@@ -287,10 +286,6 @@ int dpu_mdss_init(struct drm_device *dev)
 
 	dpu_mdss_icc_request_bw(priv->mdss);
 
-	pm_runtime_get_sync(dev->dev);
-	dpu_mdss->hwversion = readl_relaxed(dpu_mdss->mmio);
-	pm_runtime_put_sync(dev->dev);
-
 	return ret;
 
 irq_error:
Signature · 6 lines
2.20.1

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#5 lore raw

PATCH 3/3 drm/msm/dsi: make sure we have panel or bridge earlier

In reply to Rob Clark

From: Rob Clark <[email protected]>

If we are going to -EPROBE_DEFER due to panel/bridge not probed yet, we want to do it before we start touching hardware.

---
 drivers/gpu/drm/msm/dsi/dsi.h         |  2 +-
 drivers/gpu/drm/msm/dsi/dsi_host.c    | 30 +++++++++++++--------------
 drivers/gpu/drm/msm/dsi/dsi_manager.c |  9 +++-----
 3 files changed, 19 insertions(+), 22 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.h +1 -1
index 53bb124e8259..e15e7534ccd9 100644
@@ -171,7 +171,7 @@ int msm_dsi_host_set_display_mode(struct mipi_dsi_host *host,
 struct drm_panel *msm_dsi_host_get_panel(struct mipi_dsi_host *host);
 unsigned long msm_dsi_host_get_mode_flags(struct mipi_dsi_host *host);
 struct drm_bridge *msm_dsi_host_get_bridge(struct mipi_dsi_host *host);
-int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer);
+int msm_dsi_host_register(struct mipi_dsi_host *host);
 void msm_dsi_host_unregister(struct mipi_dsi_host *host);
 int msm_dsi_host_set_src_pll(struct mipi_dsi_host *host,
 			struct msm_dsi_pll *src_pll);
drivers/gpu/drm/msm/dsi/dsi_host.c +15 -15
index 1ae2f5522979..8e5b0ba9431e 100644
@@ -1824,6 +1824,20 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
 		goto fail;
 	}
 
+	/*
+	 * Make sure we have panel or bridge early, before we start
+	 * touching the hw.  If bootloader enabled the display, we
+	 * want to be sure to keep it running until the bridge/panel
+	 * is probed and we are all ready to go.  Otherwise we'll
+	 * kill the display and then -EPROBE_DEFER
+	 */
+	if (IS_ERR(of_drm_find_panel(msm_host->device_node)) &&
+			!of_drm_find_bridge(msm_host->device_node)) {
+		pr_err("%s: no panel or bridge yet\n", __func__);
+		return -EPROBE_DEFER;
+	}
+
+
 	msm_host->ctrl_base = msm_ioremap(pdev, "dsi_ctrl", "DSI CTRL");
 	if (IS_ERR(msm_host->ctrl_base)) {
 		pr_err("%s: unable to map Dsi ctrl base\n", __func__);
@@ -1941,7 +1955,7 @@ int msm_dsi_host_modeset_init(struct mipi_dsi_host *host,
 	return 0;
 }
 
-int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer)
+int msm_dsi_host_register(struct mipi_dsi_host *host)
 {
 	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);
 	int ret;
@@ -1955,20 +1969,6 @@ int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer)
 			return ret;
 
 		msm_host->registered = true;
-
-		/* If the panel driver has not been probed after host register,
-		 * we should defer the host's probe.
-		 * It makes sure panel is connected when fbcon detects
-		 * connector status and gets the proper display mode to
-		 * create framebuffer.
-		 * Don't try to defer if there is nothing connected to the dsi
-		 * output
-		 */
-		if (check_defer && msm_host->device_node) {
-			if (IS_ERR(of_drm_find_panel(msm_host->device_node)))
-				if (!of_drm_find_bridge(msm_host->device_node))
-					return -EPROBE_DEFER;
-		}
 	}
 
 	return 0;
drivers/gpu/drm/msm/dsi/dsi_manager.c +3 -6
index ff39ce6150ad..cd3450dc3481 100644
@@ -82,7 +82,7 @@ static int dsi_mgr_setup_components(int id)
 	int ret;
 
 	if (!IS_DUAL_DSI()) {
-		ret = msm_dsi_host_register(msm_dsi->host, true);
+		ret = msm_dsi_host_register(msm_dsi->host);
 		if (ret)
 			return ret;
 
@@ -101,14 +101,11 @@ static int dsi_mgr_setup_components(int id)
 		/* Register slave host first, so that slave DSI device
 		 * has a chance to probe, and do not block the master
 		 * DSI device's probe.
-		 * Also, do not check defer for the slave host,
-		 * because only master DSI device adds the panel to global
-		 * panel list. The panel's device is the master DSI device.
 		 */
-		ret = msm_dsi_host_register(slave_link_dsi->host, false);
+		ret = msm_dsi_host_register(slave_link_dsi->host);
 		if (ret)
 			return ret;
-		ret = msm_dsi_host_register(master_link_dsi->host, true);
+		ret = msm_dsi_host_register(master_link_dsi->host);
 		if (ret)
 			return ret;
 
Signature · 6 lines
2.20.1

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno
Tested-by Reviewed-by on v1 3/3
#6 lore raw

Re: [Freedreno] [PATCH 3/3] drm/msm/dsi: make sure we have panel or bridge earlier

Quoted 6 lines · Rob Clark
drivers/gpu/drm/msm/dsi/dsi_host.c +0 -0
@@ -1824,6 +1824,20 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
                goto fail;
        }
 

drivers/gpu/drm/msm/dsi/dsi_host.c int msm_dsi_host_init(struct msm_dsi *msm_dsi) · line 1836

Quoted 10 lines
drivers/gpu/drm/msm/dsi/dsi_host.c +10 -0
+       /*
+        * Make sure we have panel or bridge early, before we start
+        * touching the hw.  If bootloader enabled the display, we
+        * want to be sure to keep it running until the bridge/panel
+        * is probed and we are all ready to go.  Otherwise we'll
+        * kill the display and then -EPROBE_DEFER
+        */
+       if (IS_ERR(of_drm_find_panel(msm_host->device_node)) &&
+                       !of_drm_find_bridge(msm_host->device_node)) {
+               pr_err("%s: no panel or bridge yet\n", __func__);

pr_err() doesn't seem right for a probe defer condition. pr_dbg?

drivers/gpu/drm/msm/dsi/dsi_host.c int msm_dsi_host_init(struct msm_dsi *msm_dsi) · line 1840

Quoted 4 lines
drivers/gpu/drm/msm/dsi/dsi_host.c +4 -0
+               return -EPROBE_DEFER;
+       }
+
+

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

#7 lore raw

Re: [Freedreno] [PATCH 3/3] drm/msm/dsi: make sure we have panel or bridge earlier

Quoted 21 lines · Jeffrey Hugo
Quoted 6 lines · Rob Clark
drivers/gpu/drm/msm/dsi/dsi_host.c +0 -0
@@ -1824,6 +1824,20 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
                goto fail;
        }
 

drivers/gpu/drm/msm/dsi/dsi_host.c int msm_dsi_host_init(struct msm_dsi *msm_dsi) · line 1836

Quoted 10 lines
drivers/gpu/drm/msm/dsi/dsi_host.c +10 -0
+       /*
+        * Make sure we have panel or bridge early, before we start
+        * touching the hw.  If bootloader enabled the display, we
+        * want to be sure to keep it running until the bridge/panel
+        * is probed and we are all ready to go.  Otherwise we'll
+        * kill the display and then -EPROBE_DEFER
+        */
+       if (IS_ERR(of_drm_find_panel(msm_host->device_node)) &&
+                       !of_drm_find_bridge(msm_host->device_node)) {
+               pr_err("%s: no panel or bridge yet\n", __func__);

pr_err() doesn't seem right for a probe defer condition. pr_dbg?

Quoted 7 lines

drivers/gpu/drm/msm/dsi/dsi_host.c int msm_dsi_host_init(struct msm_dsi *msm_dsi) · line 1840

Quoted 4 lines
drivers/gpu/drm/msm/dsi/dsi_host.c +4 -0
+               return -EPROBE_DEFER;
+       }
+
+

Actually, I'm sorry, I'm now NACKing this.

Turns out this prevents the panel/bridge from ever probing if its a child node of the dsi device, since mipi_dsi_host_register() is never called.

This probably works for you on the c630 because the bridge hangs off the i2c bus.
_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno

#8 lore raw

Re: [PATCH 3/3] drm/msm/dsi: make sure we have panel or bridge earlier

In reply to Rob Clark
Quoted 4 lines · Rob Clark

From: Rob Clark <[email protected]>

If we are going to -EPROBE_DEFER due to panel/bridge not probed yet, we want to do it before we start touching hardware.

As the evidence shows, if the driver create bus (mipi-dsi), then it should not defer probing due to lack of sink (panel/bridge), because the sink will not appear without the bus.

Instead of defer probing you can defer component binding, or if you like challenges you can implement dynamic sink binding :)

Regards

Andrzej

Quoted 106 lines
---
 drivers/gpu/drm/msm/dsi/dsi.h         |  2 +-
 drivers/gpu/drm/msm/dsi/dsi_host.c    | 30 +++++++++++++--------------
 drivers/gpu/drm/msm/dsi/dsi_manager.c |  9 +++-----
 3 files changed, 19 insertions(+), 22 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.h +1 -1
index 53bb124e8259..e15e7534ccd9 100644
@@ -171,7 +171,7 @@ int msm_dsi_host_set_display_mode(struct mipi_dsi_host *host,
 struct drm_panel *msm_dsi_host_get_panel(struct mipi_dsi_host *host);
 unsigned long msm_dsi_host_get_mode_flags(struct mipi_dsi_host *host);
 struct drm_bridge *msm_dsi_host_get_bridge(struct mipi_dsi_host *host);
-int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer);
+int msm_dsi_host_register(struct mipi_dsi_host *host);
 void msm_dsi_host_unregister(struct mipi_dsi_host *host);
 int msm_dsi_host_set_src_pll(struct mipi_dsi_host *host,
 			struct msm_dsi_pll *src_pll);
drivers/gpu/drm/msm/dsi/dsi_host.c +15 -15
index 1ae2f5522979..8e5b0ba9431e 100644
@@ -1824,6 +1824,20 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
 		goto fail;
 	}
 
+	/*
+	 * Make sure we have panel or bridge early, before we start
+	 * touching the hw.  If bootloader enabled the display, we
+	 * want to be sure to keep it running until the bridge/panel
+	 * is probed and we are all ready to go.  Otherwise we'll
+	 * kill the display and then -EPROBE_DEFER
+	 */
+	if (IS_ERR(of_drm_find_panel(msm_host->device_node)) &&
+			!of_drm_find_bridge(msm_host->device_node)) {
+		pr_err("%s: no panel or bridge yet\n", __func__);
+		return -EPROBE_DEFER;
+	}
+
+
 	msm_host->ctrl_base = msm_ioremap(pdev, "dsi_ctrl", "DSI CTRL");
 	if (IS_ERR(msm_host->ctrl_base)) {
 		pr_err("%s: unable to map Dsi ctrl base\n", __func__);
@@ -1941,7 +1955,7 @@ int msm_dsi_host_modeset_init(struct mipi_dsi_host *host,
 	return 0;
 }
 
-int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer)
+int msm_dsi_host_register(struct mipi_dsi_host *host)
 {
 	struct msm_dsi_host *msm_host = to_msm_dsi_host(host);
 	int ret;
@@ -1955,20 +1969,6 @@ int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer)
 			return ret;
 
 		msm_host->registered = true;
-
-		/* If the panel driver has not been probed after host register,
-		 * we should defer the host's probe.
-		 * It makes sure panel is connected when fbcon detects
-		 * connector status and gets the proper display mode to
-		 * create framebuffer.
-		 * Don't try to defer if there is nothing connected to the dsi
-		 * output
-		 */
-		if (check_defer && msm_host->device_node) {
-			if (IS_ERR(of_drm_find_panel(msm_host->device_node)))
-				if (!of_drm_find_bridge(msm_host->device_node))
-					return -EPROBE_DEFER;
-		}
 	}
 
 	return 0;
drivers/gpu/drm/msm/dsi/dsi_manager.c +3 -6
index ff39ce6150ad..cd3450dc3481 100644
@@ -82,7 +82,7 @@ static int dsi_mgr_setup_components(int id)
 	int ret;
 
 	if (!IS_DUAL_DSI()) {
-		ret = msm_dsi_host_register(msm_dsi->host, true);
+		ret = msm_dsi_host_register(msm_dsi->host);
 		if (ret)
 			return ret;
 
@@ -101,14 +101,11 @@ static int dsi_mgr_setup_components(int id)
 		/* Register slave host first, so that slave DSI device
 		 * has a chance to probe, and do not block the master
 		 * DSI device's probe.
-		 * Also, do not check defer for the slave host,
-		 * because only master DSI device adds the panel to global
-		 * panel list. The panel's device is the master DSI device.
 		 */
-		ret = msm_dsi_host_register(slave_link_dsi->host, false);
+		ret = msm_dsi_host_register(slave_link_dsi->host);
 		if (ret)
 			return ret;
-		ret = msm_dsi_host_register(master_link_dsi->host, true);
+		ret = msm_dsi_host_register(master_link_dsi->host);
 		if (ret)
 			return ret;
 
#9 lore raw

Re: [PATCH 3/3] drm/msm/dsi: make sure we have panel or bridge earlier

Quoted 8 lines · Andrzej Hajda
Quoted 4 lines · Rob Clark

From: Rob Clark <[email protected]>

If we are going to -EPROBE_DEFER due to panel/bridge not probed yet, we want to do it before we start touching hardware.

Quoted 7 lines

As the evidence shows, if the driver create bus (mipi-dsi), then it should not defer probing due to lack of sink (panel/bridge), because the sink will not appear without the bus.

Instead of defer probing you can defer component binding, or if you like challenges you can implement dynamic sink binding :)

I have something working that doesn't require this patch.. although it does require CCF to export a function to check if clks are enabled so the driver can detect if the display is already enabled. (Well, there kind of is, __clk_is_enabled().. but currently in clk-provider.h)

So we can drop this patch.

BR,
-R

Quoted 106 lines

Regards

Andrzej

Quoted 98 lines
---
 drivers/gpu/drm/msm/dsi/dsi.h         |  2 +-
 drivers/gpu/drm/msm/dsi/dsi_host.c    | 30 +++++++++++++--------------
 drivers/gpu/drm/msm/dsi/dsi_manager.c |  9 +++-----
 3 files changed, 19 insertions(+), 22 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.h +1 -1
index 53bb124e8259..e15e7534ccd9 100644
@@ -171,7 +171,7 @@ int msm_dsi_host_set_display_mode(struct mipi_dsi_host *host,
 struct drm_panel *msm_dsi_host_get_panel(struct mipi_dsi_host *host);
 unsigned long msm_dsi_host_get_mode_flags(struct mipi_dsi_host *host);
 struct drm_bridge *msm_dsi_host_get_bridge(struct mipi_dsi_host *host);
-int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer);
+int msm_dsi_host_register(struct mipi_dsi_host *host);
 void msm_dsi_host_unregister(struct mipi_dsi_host *host);
 int msm_dsi_host_set_src_pll(struct mipi_dsi_host *host,
                      struct msm_dsi_pll *src_pll);
drivers/gpu/drm/msm/dsi/dsi_host.c +15 -15
index 1ae2f5522979..8e5b0ba9431e 100644
@@ -1824,6 +1824,20 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
              goto fail;
      }
 
+     /*
+      * Make sure we have panel or bridge early, before we start
+      * touching the hw.  If bootloader enabled the display, we
+      * want to be sure to keep it running until the bridge/panel
+      * is probed and we are all ready to go.  Otherwise we'll
+      * kill the display and then -EPROBE_DEFER
+      */
+     if (IS_ERR(of_drm_find_panel(msm_host->device_node)) &&
+                     !of_drm_find_bridge(msm_host->device_node)) {
+             pr_err("%s: no panel or bridge yet\n", __func__);
+             return -EPROBE_DEFER;
+     }
+
+
      msm_host->ctrl_base = msm_ioremap(pdev, "dsi_ctrl", "DSI CTRL");
      if (IS_ERR(msm_host->ctrl_base)) {
              pr_err("%s: unable to map Dsi ctrl base\n", __func__);
@@ -1941,7 +1955,7 @@ int msm_dsi_host_modeset_init(struct mipi_dsi_host *host,
      return 0;
 }
 
-int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer)
+int msm_dsi_host_register(struct mipi_dsi_host *host)
 {
      struct msm_dsi_host *msm_host = to_msm_dsi_host(host);
      int ret;
@@ -1955,20 +1969,6 @@ int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer)
                      return ret;
 
              msm_host->registered = true;
-
-             /* If the panel driver has not been probed after host register,
-              * we should defer the host's probe.
-              * It makes sure panel is connected when fbcon detects
-              * connector status and gets the proper display mode to
-              * create framebuffer.
-              * Don't try to defer if there is nothing connected to the dsi
-              * output
-              */
-             if (check_defer && msm_host->device_node) {
-                     if (IS_ERR(of_drm_find_panel(msm_host->device_node)))
-                             if (!of_drm_find_bridge(msm_host->device_node))
-                                     return -EPROBE_DEFER;
-             }
      }
 
      return 0;
drivers/gpu/drm/msm/dsi/dsi_manager.c +1 -5
index ff39ce6150ad..cd3450dc3481 100644
@@ -82,7 +82,7 @@ static int dsi_mgr_setup_components(int id)
      int ret;
 
      if (!IS_DUAL_DSI()) {
-             ret = msm_dsi_host_register(msm_dsi->host, true);
+             ret = msm_dsi_host_register(msm_dsi->host);
              if (ret)
                      return ret;
 
@@ -101,14 +101,11 @@ static int dsi_mgr_setup_components(int id)
              /* Register slave host first, so that slave DSI device
               * has a chance to probe, and do not block the master
               * DSI device's probe.
-              * Also, do not check defer for the slave host,
-              * because only master DSI device adds the panel to global
-              * panel list. The panel's device is the master DSI device.
               */
-             ret = msm_dsi_host_register(slave_link_dsi->host, false);
Quoted 10 lines

drivers/gpu/drm/msm/dsi/dsi_manager.c static int dsi_mgr_setup_components(int id) · line 111

Quoted 8 lines
drivers/gpu/drm/msm/dsi/dsi_manager.c +2 -1
+             ret = msm_dsi_host_register(slave_link_dsi->host);
              if (ret)
                      return ret;
-             ret = msm_dsi_host_register(master_link_dsi->host, true);
+             ret = msm_dsi_host_register(master_link_dsi->host);
              if (ret)
                      return ret;
 

_______________________________________________
Freedreno mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/freedreno