lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 441/717] drm: mxsfb: Silence -EPROBE_DEFER while waiting for bridge
    Date
    From: Guido Günther <agx@sigxcpu.org>

    [ Upstream commit ee46d16d2e40bebc2aa790fd7b6a056466ff895c ]

    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: Guido Günther <agx@sigxcpu.org>
    Fixes: c42001e357f7 ("drm: mxsfb: Use drm_panel_bridge")
    Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Link: https://patchwork.freedesktop.org/patch/msgid/d5761eb871adde5464ba112b89d966568bc2ff6c.1608020391.git.agx@sigxcpu.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
    index 35122aef037b4..17f26052e8450 100644
    --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c
    +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c
    @@ -134,11 +134,8 @@ static int mxsfb_attach_bridge(struct mxsfb_drm_private *mxsfb)
    return -ENODEV;

    ret = drm_bridge_attach(&mxsfb->encoder, bridge, NULL, 0);
    - if (ret) {
    - DRM_DEV_ERROR(drm->dev,
    - "failed to attach bridge: %d\n", ret);
    - return ret;
    - }
    + if (ret)
    + return dev_err_probe(drm->dev, ret, "Failed to attach bridge\n");

    mxsfb->bridge = bridge;

    @@ -212,7 +209,8 @@ static int mxsfb_load(struct drm_device *drm,

    ret = mxsfb_attach_bridge(mxsfb);
    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;
    }

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:49    [W:4.799 / U:0.312 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site