Commit ee46d16d authored by Guido Günther's avatar Guido Günther Committed by Daniel Vetter

drm: mxsfb: Silence -EPROBE_DEFER while waiting for bridge

It can take multiple iterations until all components for an attached DSI
bridge are up leading to several:

[    3.796425] mxsfb 30320000.lcd-controller: Cannot connect bridge: -517
[    3.816952] mxsfb 30320000.lcd-controller: [drm:mxsfb_probe [mxsfb]] *ERROR* failed to attach bridge: -517

Silence this by checking for -EPROBE_DEFER and using dev_err_probe() so
we set a deferred reason in case a dependency fails to probe (which
quickly happens on small config/DT changes due to the rather long probe
chain which can include bridges, phys, panels, backights, leds, etc.).

This also removes the only DRM_DEV_ERROR() usage, the rest of the driver
uses dev_err().
Signed-off-by: default avatarGuido Günther <agx@sigxcpu.org>
Fixes: c42001e3 ("drm: mxsfb: Use drm_panel_bridge")
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/d5761eb871adde5464ba112b89d966568bc2ff6c.1608020391.git.agx@sigxcpu.org
parent be98e05a
...@@ -134,11 +134,8 @@ static int mxsfb_attach_bridge(struct mxsfb_drm_private *mxsfb) ...@@ -134,11 +134,8 @@ static int mxsfb_attach_bridge(struct mxsfb_drm_private *mxsfb)
return -ENODEV; return -ENODEV;
ret = drm_bridge_attach(&mxsfb->encoder, bridge, NULL, 0); ret = drm_bridge_attach(&mxsfb->encoder, bridge, NULL, 0);
if (ret) { if (ret)
DRM_DEV_ERROR(drm->dev, return dev_err_probe(drm->dev, ret, "Failed to attach bridge\n");
"failed to attach bridge: %d\n", ret);
return ret;
}
mxsfb->bridge = bridge; mxsfb->bridge = bridge;
...@@ -212,7 +209,8 @@ static int mxsfb_load(struct drm_device *drm, ...@@ -212,7 +209,8 @@ static int mxsfb_load(struct drm_device *drm,
ret = mxsfb_attach_bridge(mxsfb); ret = mxsfb_attach_bridge(mxsfb);
if (ret) { if (ret) {
dev_err(drm->dev, "Cannot connect bridge: %d\n", ret); if (ret != -EPROBE_DEFER)
dev_err(drm->dev, "Cannot connect bridge: %d\n", ret);
goto err_vblank; goto err_vblank;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment