Forward the error given by of_drm_get_bridge_by_endpoint() if it is
EPROBE_DEFER to ensure output gets initialized later when available.

On GTA04/OMAP3 no display was found, but it appeared after doing
rmmod omapdrm ; modprobe omapdrm

Fixes: b7e9b93fc8ecf ("drm/omap: dss: don't create a panel_bridge")
Signed-off-by: Andreas Kemnade <[email protected]>
---
 drivers/gpu/drm/omapdrm/dss/output.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/omapdrm/dss/output.c 
b/drivers/gpu/drm/omapdrm/dss/output.c
index 36d37deac8026..220ed7e003080 100644
--- a/drivers/gpu/drm/omapdrm/dss/output.c
+++ b/drivers/gpu/drm/omapdrm/dss/output.c
@@ -24,6 +24,11 @@ int omapdss_device_init_output(struct omap_dss_device *out,
 
        bridge = of_drm_get_bridge_by_endpoint(out->dev->of_node, out->of_port, 
0);
        if (IS_ERR(bridge)) {
+               if (PTR_ERR(bridge) == -EPROBE_DEFER) {
+                       ret = PTR_ERR(bridge);
+                       goto error;
+               }
+
                dev_dbg(out->dev, "failed to find video sink\n");
                return 0;
        }

---
base-commit: 7475ea8b58616b33c04afb976cf0fbaad9dd63fb
change-id: 20261111-gta04-drm-regression-fix-f7ef51c66ed3

Best regards,
--  
Andreas Kemnade <[email protected]>

Reply via email to