Merge v5.6-rc5 into drm-next

[linux-2.6-microblaze.git] / drivers / gpu / drm / msm / dsi / dsi_manager.c

diff --git a/drivers/gpu/drm/msm/dsi/dsi_manager.c b/drivers/gpu/drm/msm/dsi/dsi_manager.c
index 4864b95..4b363bd 100644 (file)
--- a/drivers/gpu/drm/msm/dsi/dsi_manager.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_manager.c
@@ -689,7 +689,7 @@ struct drm_bridge *msm_dsi_manager_bridge_init(u8 id)
        bridge = &dsi_bridge->base;
        bridge->funcs = &dsi_mgr_bridge_funcs;
 
-       ret = drm_bridge_attach(encoder, bridge, NULL);
+       ret = drm_bridge_attach(encoder, bridge, NULL, 0);
        if (ret)
                goto fail;
 
@@ -718,7 +718,7 @@ struct drm_connector *msm_dsi_manager_ext_bridge_init(u8 id)
        encoder = msm_dsi->encoder;
 
        /* link the internal dsi bridge to the external bridge */
-       drm_bridge_attach(encoder, ext_bridge, int_bridge);
+       drm_bridge_attach(encoder, ext_bridge, int_bridge, 0);
 
        /*
         * we need the drm_connector created by the external bridge