diff options
| author | Boris Brezillon <boris.brezillon@collabora.com> | 2019-08-26 17:26:36 +0200 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@collabora.com> | 2019-08-28 22:22:49 +0200 |
| commit | 3ef2f119bd3edf12469632629d5ae33f255dbaa5 (patch) | |
| tree | 02336472124e021ebd23010453483662b857cbd3 /drivers/gpu/drm/msm/hdmi/hdmi.c | |
| parent | drm: Stop including drm_bridge.h from drm_crtc.h (diff) | |
| download | linux-3ef2f119bd3edf12469632629d5ae33f255dbaa5.tar.xz linux-3ef2f119bd3edf12469632629d5ae33f255dbaa5.zip | |
drm/msm: Use drm_attach_bridge() to attach a bridge to an encoder
This is part of our attempt to make the bridge chain a double-linked
list based on the generic list helpers. In order to do that, we must
patch all drivers manipulating the encoder->bridge field directly.
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190826152649.13820-9-boris.brezillon@collabora.com
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/msm/hdmi/hdmi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 0e4217be3f00..55b9a8c8312b 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c @@ -327,7 +327,9 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, goto fail; } - encoder->bridge = hdmi->bridge; + 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; |