Skip to contentSkip to conversation

drm: exynos: dsi: Use child panel or bridge find helpers

PATCH Applied Jagan Teki 3 participants 5 messages Apr 28, 2022 – May 4, 2022

Subsystems (3)
lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 drm: exynos: dsi: Use child panel or bridge find helpers

commit <711c7adc4687> ("drm: exynos: dsi: Use drm panel_bridge API") added devm_drm_of_get_bridge for looking up if child node has panel or bridge.

However commit <b089c0a9b14c> ("Revert "drm: of: Lookup if child node has panel or bridge") has reverted panel or bridge child node lookup from devm_drm_of_get_bridge which eventually failed to find the DSI devices in exynos drm dsi driver.

So, use the conventional child panel bridge lookup helpers like it does before.

---
 drivers/gpu/drm/exynos/exynos_drm_dsi.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos_drm_dsi.c +11 -1
index f067c86b0b12..ec673223d6b7 100644
@@ -25,6 +25,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_simple_kms_helper.h>
@@ -1451,9 +1452,18 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
 	struct device *dev = dsi->dev;
 	struct drm_encoder *encoder = &dsi->encoder;
 	struct drm_device *drm = encoder->dev;
+	struct drm_panel *panel;
 	int ret;
 
-	dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	panel = of_drm_find_panel(device->dev.of_node);
+	if (!IS_ERR(panel)) {
+		dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel);
+	} else {
+		dsi->out_bridge = of_drm_find_bridge(device->dev.of_node);
+		if (!dsi->out_bridge)
+			dsi->out_bridge = ERR_PTR(-EINVAL);
+	}
+
 	if (IS_ERR(dsi->out_bridge)) {
 		ret = PTR_ERR(dsi->out_bridge);
 		DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret);
Signature · 1 line
2.25.1
Tested-by on v1 1/1
#1 lore raw
Quoted 9 lines · Jagan Teki

commit <711c7adc4687> ("drm: exynos: dsi: Use drm panel_bridge API") added devm_drm_of_get_bridge for looking up if child node has panel or bridge.

However commit <b089c0a9b14c> ("Revert "drm: of: Lookup if child node has panel or bridge") has reverted panel or bridge child node lookup from devm_drm_of_get_bridge which eventually failed to find the DSI devices in exynos drm dsi driver.

Quoted 4 lines

So, use the conventional child panel bridge lookup helpers like it does before.

This restores Exynos DSI driver operation in linux-next after the mentioned commits went via drm-misc-fixes tree.

Quoted 26 lines
---
  drivers/gpu/drm/exynos/exynos_drm_dsi.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos_drm_dsi.c +4 -1
index f067c86b0b12..ec673223d6b7 100644
@@ -25,6 +25,7 @@
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_bridge.h>
  #include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
  #include <drm/drm_print.h>
  #include <drm/drm_probe_helper.h>
  #include <drm/drm_simple_kms_helper.h>
@@ -1451,9 +1452,18 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
  	struct device *dev = dsi->dev;
  	struct drm_encoder *encoder = &dsi->encoder;
  	struct drm_device *drm = encoder->dev;
+	struct drm_panel *panel;
  	int ret;
 
-	dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	panel = of_drm_find_panel(device->dev.of_node);
+	if (!IS_ERR(panel)) {

drivers/gpu/drm/exynos/exynos_drm_dsi.c static int exynos_dsi_host_attach(struct mipi_dsi_host *host, · line 1469

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_drm_dsi.c +7 -0
+		dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel);
+	} else {
+		dsi->out_bridge = of_drm_find_bridge(device->dev.of_node);
+		if (!dsi->out_bridge)
+			dsi->out_bridge = ERR_PTR(-EINVAL);
+	}
+
  	if (IS_ERR(dsi->out_bridge)) {
  		ret = PTR_ERR(dsi->out_bridge);
  		DRM_DEV_ERROR(dev, "failed to find the bridge: %d\n", ret);

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
#2 lore raw
In reply to Jagan Teki
Quoted 36 lines · Jagan Teki

commit <711c7adc4687> ("drm: exynos: dsi: Use drm panel_bridge API") added devm_drm_of_get_bridge for looking up if child node has panel or bridge.

However commit <b089c0a9b14c> ("Revert "drm: of: Lookup if child node has panel or bridge") has reverted panel or bridge child node lookup from devm_drm_of_get_bridge which eventually failed to find the DSI devices in exynos drm dsi driver.

So, use the conventional child panel bridge lookup helpers like it does before.

---
 drivers/gpu/drm/exynos/exynos_drm_dsi.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos_drm_dsi.c +2 -0
index f067c86b0b12..ec673223d6b7 100644
@@ -25,6 +25,7 @@
 #include <drm/drm_atomic_helper.h>
 #include <drm/drm_bridge.h>
 #include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
 #include <drm/drm_print.h>
 #include <drm/drm_probe_helper.h>
 #include <drm/drm_simple_kms_helper.h>
@@ -1451,9 +1452,18 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
 	struct device *dev = dsi->dev;
 	struct drm_encoder *encoder = &dsi->encoder;
 	struct drm_device *drm = encoder->dev;
+	struct drm_panel *panel;
 	int ret;
 

drivers/gpu/drm/exynos/exynos_drm_dsi.c static int exynos_dsi_host_attach(struct mipi_dsi_host *host, · line 1466

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_drm_dsi.c +9 -1
-	dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	panel = of_drm_find_panel(device->dev.of_node);
+	if (!IS_ERR(panel)) {
+		dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel);
+	} else {
+		dsi->out_bridge = of_drm_find_bridge(device->dev.of_node);
+		if (!dsi->out_bridge)
+			dsi->out_bridge = ERR_PTR(-EINVAL);
+	}
+

We should just revert 711c7adc4687 entirely (and make it very explicit in the commit log). The out_bridge lifetime is completely screwed-up in that patch now. If there's a panel it will be managed, but it's not if there's a bridge.

Maxime

#3 lore raw

Hi Maxime,

Quoted 37 lines · Maxime Ripard
Quoted 36 lines · Jagan Teki

commit <711c7adc4687> ("drm: exynos: dsi: Use drm panel_bridge API") added devm_drm_of_get_bridge for looking up if child node has panel or bridge.

However commit <b089c0a9b14c> ("Revert "drm: of: Lookup if child node has panel or bridge") has reverted panel or bridge child node lookup from devm_drm_of_get_bridge which eventually failed to find the DSI devices in exynos drm dsi driver.

So, use the conventional child panel bridge lookup helpers like it does before.

---
  drivers/gpu/drm/exynos/exynos_drm_dsi.c | 12 +++++++++++-
  1 file changed, 11 insertions(+), 1 deletion(-)
drivers/gpu/drm/exynos/exynos_drm_dsi.c +2 -0
index f067c86b0b12..ec673223d6b7 100644
@@ -25,6 +25,7 @@
  #include <drm/drm_atomic_helper.h>
  #include <drm/drm_bridge.h>
  #include <drm/drm_mipi_dsi.h>
+#include <drm/drm_panel.h>
  #include <drm/drm_print.h>
  #include <drm/drm_probe_helper.h>
  #include <drm/drm_simple_kms_helper.h>
@@ -1451,9 +1452,18 @@ static int exynos_dsi_host_attach(struct mipi_dsi_host *host,
  	struct device *dev = dsi->dev;
  	struct drm_encoder *encoder = &dsi->encoder;
  	struct drm_device *drm = encoder->dev;
+	struct drm_panel *panel;
  	int ret;
 
Quoted 14 lines

drivers/gpu/drm/exynos/exynos_drm_dsi.c static int exynos_dsi_host_attach(struct mipi_dsi_host *host, · line 1466

Quoted 10 lines
drivers/gpu/drm/exynos/exynos_drm_dsi.c +9 -1
-	dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 1, 0);
+	panel = of_drm_find_panel(device->dev.of_node);
+	if (!IS_ERR(panel)) {
+		dsi->out_bridge = devm_drm_panel_bridge_add(dev, panel);
+	} else {
+		dsi->out_bridge = of_drm_find_bridge(device->dev.of_node);
+		if (!dsi->out_bridge)
+			dsi->out_bridge = ERR_PTR(-EINVAL);
+	}
+

We should just revert 711c7adc4687 entirely (and make it very explicit in the commit log). The out_bridge lifetime is completely screwed-up in that patch now. If there's a panel it will be managed, but it's not if there's a bridge.

Nope, this patch does exactly what is needed there.

If there is a panel, it creates a managed panel_bridge() proxy. If there is a bridge, it simply gets a pointer to it. There is nothing to manage if there is a bridge attached next to DSI. See devm_drm_of_get_bridge() function, it does exactly the same things (managed panel_bridge or simple pointer to the real next bridge). I agree that this is not very obvious at the first sight, but that's how the code is now structured.

Please queue this to drm-misc-next, so the Exynos DSI will be again operational after merging the drm-misc-fixes and drm-misc-next.

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
#4 lore raw

Re: (subset) [PATCH] drm: exynos: dsi: Use child panel or bridge find helpers

In reply to Jagan Teki
Quoted 10 lines · Jagan Teki

commit <711c7adc4687> ("drm: exynos: dsi: Use drm panel_bridge API") added devm_drm_of_get_bridge for looking up if child node has panel or bridge.

However commit <b089c0a9b14c> ("Revert "drm: of: Lookup if child node has panel or bridge") has reverted panel or bridge child node lookup from devm_drm_of_get_bridge which eventually failed to find the DSI devices in exynos drm dsi driver.

[...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime