Commit c479017f authored Mar 11, 2020 by Ilia Mirkin Committed by Rob Clark Mar 19, 2020

drm/msm: avoid double-attaching hdmi/edp bridges



Each of hdmi and edp are already attached in msm_*_bridge_init. A second
attachment returns -EBUSY, failing the driver load.

Tested with HDMI on IFC6410 (APQ8064 / MDP4), but eDP case should be
analogous.

Fixes: 3ef2f119 (drm/msm: Use drm_attach_bridge() to attach a bridge to an encoder)
Cc: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> (hdmi part)
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>

parent de3916c7

drivers/gpu/drm/msm/edp/edp.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -178,10 +178,6 @@ int msm_edp_modeset_init(struct msm_edp edp, struct drm_device dev,
		goto fail;
		}

		ret = drm_bridge_attach(encoder, edp->bridge, NULL);
		if (ret)
		goto fail;

		priv->bridges[priv->num_bridges++] = edp->bridge;
		priv->connectors[priv->num_connectors++] = edp->connector;

drivers/gpu/drm/msm/hdmi/hdmi.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -327,10 +327,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi,
		goto fail;
		}

		ret = drm_bridge_attach(encoder, hdmi->bridge, NULL);
		if (ret)
		goto fail;

		priv->bridges[priv->num_bridges++] = hdmi->bridge;
		priv->connectors[priv->num_connectors++] = hdmi->connector;

Admin message