| Message ID | 20240628115131.2903251-1-alexander.stein@ew.tq-group.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4,1/1] drm/bridge: Silence error messages upon probe deferral | expand |
On Fri, Jun 28, 2024 at 01:51:30PM GMT, Alexander Stein wrote: > When -EPROBE_DEFER is returned do not raise an error, but silently return > this error instead. Fixes error like this: > [drm:drm_bridge_attach] *ERROR* failed to attach bridge > /soc@0/bus@30800000/mipi-dsi@30a00000 to encoder None-34: -517 > [drm:drm_bridge_attach] *ERROR* failed to attach bridge > /soc@0/bus@30800000/mipi-dsi@30a00000 to encoder None-34: -517 > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> > Reviewed-by: Robert Foss <rfoss@kernel.org> > --- > Changes in v4: > * Rebased to next-20240628 > > drivers/gpu/drm/drm_bridge.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c > index d44f055dbe3e7..3e72dfd941577 100644 > --- a/drivers/gpu/drm/drm_bridge.c > +++ b/drivers/gpu/drm/drm_bridge.c > @@ -353,8 +353,9 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, > bridge->encoder = NULL; > list_del(&bridge->chain_node); > > - DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", > - bridge->of_node, encoder->name, ret); > + if (ret != -EPROBE_DEFER) > + DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", > + bridge->of_node, encoder->name, ret); Maybe? else dev_err_probe(encoder->dev->dev, -EPROBE_DEFER, "failed to attach...\n"); > > return ret; > } > -- > 2.34.1 >
diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index d44f055dbe3e7..3e72dfd941577 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -353,8 +353,9 @@ int drm_bridge_attach(struct drm_encoder *encoder, struct drm_bridge *bridge, bridge->encoder = NULL; list_del(&bridge->chain_node); - DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", - bridge->of_node, encoder->name, ret); + if (ret != -EPROBE_DEFER) + DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", + bridge->of_node, encoder->name, ret); return ret; }