]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/bridge: Silence error messages upon probe deferral
authorAlexander Stein <alexander.stein@ew.tq-group.com>
Wed, 3 Jul 2024 12:27:15 +0000 (14:27 +0200)
committerRobert Foss <rfoss@kernel.org>
Thu, 18 Jul 2024 11:20:16 +0000 (13:20 +0200)
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>
Signed-off-by: Robert Foss <rfoss@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240703122715.4004765-1-alexander.stein@ew.tq-group.com
drivers/gpu/drm/drm_bridge.c

index d44f055dbe3e782a6ae4e2714c30dc92815bae68..c6af46dd02bfa9e15b59e4c460debdd7fd84be44 100644 (file)
@@ -353,8 +353,13 @@ err_reset_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);
+       else
+               dev_err_probe(encoder->dev->dev, -EPROBE_DEFER,
+                             "failed to attach bridge %pOF to encoder %s\n",
+                             bridge->of_node, encoder->name);
 
        return ret;
 }