Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b996496 authored by Steve Cohen's avatar Steve Cohen
Browse files

drm/msm: update use of drm_bridge_attach in dp and dsi drivers 



In 4.14 the API for drm_bridge_attach has been changed to include
a previous bridge parameter.  This change updates the DP and DSI
drivers ported from 4.9 to be compatible with this new API.

Change-Id: Ie25e2747cea9a9f4c48f34fba595c992fd1ff51d
Signed-off-by: default avatarSteve Cohen <cohens@codeaurora.org>
parent 2d2f20e9

drivers/gpu/drm/msm/dp/dp_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ int dp_drm_bridge_init(void *data, struct drm_encoder *encoder) 


	priv = dev->dev_private;



	rc = drm_bridge_attach(dev, &bridge->base);

	rc = drm_bridge_attach(encoder, &bridge->base, NULL);

	if (rc) {

		pr_err("failed to attach bridge, rc=%d\n", rc);

		goto error_free_bridge;

drivers/gpu/drm/msm/dsi-staging/dsi_drm.c

+1 −1
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ struct dsi_bridge *dsi_drm_bridge_init(struct dsi_display *display, 
	bridge->base.funcs = &dsi_bridge_ops;

	bridge->base.encoder = encoder;



	rc = drm_bridge_attach(dev, &bridge->base);

	rc = drm_bridge_attach(encoder, &bridge->base, NULL);

	if (rc) {

		pr_err("failed to attach bridge, rc=%d\n", rc);

		goto error_free_bridge;