Merge tag 'v5.8' into drm-next

[J-linux.git] / drivers / gpu / drm / bridge / cdns-dsi.c

diff --git a/drivers/gpu/drm/bridge/cdns-dsi.c b/drivers/gpu/drm/bridge/cdns-dsi.c
index b7c97f0602417bc11c2226893f40b3feab972367..76373e31df92dc444b82733b7b7c6730f27efade 100644 (file)
--- a/drivers/gpu/drm/bridge/cdns-dsi.c
+++ b/drivers/gpu/drm/bridge/cdns-dsi.c
@@ -644,7 +644,8 @@ static int cdns_dsi_check_conf(struct cdns_dsi *dsi,
        return 0;
 }
 
-static int cdns_dsi_bridge_attach(struct drm_bridge *bridge)
+static int cdns_dsi_bridge_attach(struct drm_bridge *bridge,
+                                 enum drm_bridge_attach_flags flags)
 {
        struct cdns_dsi_input *input = bridge_to_cdns_dsi_input(bridge);
        struct cdns_dsi *dsi = input_to_dsi(input);
@@ -656,11 +657,13 @@ static int cdns_dsi_bridge_attach(struct drm_bridge *bridge)
                return -ENOTSUPP;
        }
 
-       return drm_bridge_attach(bridge->encoder, output->bridge, bridge);
+       return drm_bridge_attach(bridge->encoder, output->bridge, bridge,
+                                flags);
 }
 
 static enum drm_mode_status
 cdns_dsi_bridge_mode_valid(struct drm_bridge *bridge,
+                          const struct drm_display_info *info,
                           const struct drm_display_mode *mode)
 {
        struct cdns_dsi_input *input = bridge_to_cdns_dsi_input(bridge);