diff --git a/msm/dp/dp_drm.c b/msm/dp/dp_drm.c index 482b645fe0..0d26203b98 100644 --- a/msm/dp/dp_drm.c +++ b/msm/dp/dp_drm.c @@ -59,7 +59,8 @@ void convert_to_drm_mode(const struct dp_display_mode *dp_mode, drm_mode_set_name(drm_mode); } -static int dp_bridge_attach(struct drm_bridge *dp_bridge) +static int dp_bridge_attach(struct drm_bridge *dp_bridge, + enum drm_bridge_attach_flags flags) { struct dp_bridge *bridge = to_dp_bridge(dp_bridge); @@ -616,7 +617,7 @@ int dp_drm_bridge_init(void *data, struct drm_encoder *encoder, priv = dev->dev_private; - rc = drm_bridge_attach(encoder, &bridge->base, NULL); + rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0); if (rc) { DP_ERR("failed to attach bridge, rc=%d\n", rc); goto error_free_bridge; diff --git a/msm/dp/dp_drm.h b/msm/dp/dp_drm.h index 5d7462cd20..7218fe6534 100644 --- a/msm/dp/dp_drm.h +++ b/msm/dp/dp_drm.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "msm_drv.h" #include "dp_display.h" diff --git a/msm/dp/dp_mst_drm.c b/msm/dp/dp_mst_drm.c index 0f26cd15d1..f30f07276a 100644 --- a/msm/dp/dp_mst_drm.c +++ b/msm/dp/dp_mst_drm.c @@ -734,7 +734,8 @@ static const struct dp_drm_mst_fw_helper_ops drm_dp_sim_mst_fw_helper_ops = { /* DP MST Bridge OPs */ -static int dp_mst_bridge_attach(struct drm_bridge *dp_bridge) +static int dp_mst_bridge_attach(struct drm_bridge *dp_bridge, + enum drm_bridge_attach_flags flags) { struct dp_mst_bridge *bridge; @@ -1294,7 +1295,7 @@ int dp_mst_drm_bridge_init(void *data, struct drm_encoder *encoder) priv = dev->dev_private; - rc = drm_bridge_attach(encoder, &bridge->base, NULL); + rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0); if (rc) { DP_ERR("failed to attach bridge, rc=%d\n", rc); goto end; diff --git a/msm/dp/dp_mst_drm.h b/msm/dp/dp_mst_drm.h index 9d17bbf91c..a2de0e499a 100644 --- a/msm/dp/dp_mst_drm.h +++ b/msm/dp/dp_mst_drm.h @@ -9,6 +9,7 @@ #include #include #include +#include #include "dp_display.h" diff --git a/msm/dsi/dsi_display.c b/msm/dsi/dsi_display.c index 5ff0f43c1c..9393b176df 100644 --- a/msm/dsi/dsi_display.c +++ b/msm/dsi/dsi_display.c @@ -6419,7 +6419,7 @@ int dsi_display_drm_ext_bridge_init(struct dsi_display *display, ext_bridge->funcs = &ext_bridge_info->bridge_funcs; } - rc = drm_bridge_attach(encoder, ext_bridge, prev_bridge); + rc = drm_bridge_attach(encoder, ext_bridge, prev_bridge, 0); if (rc) { DSI_ERR("[%s] ext brige attach failed, %d\n", display->name, rc); diff --git a/msm/dsi/dsi_display.h b/msm/dsi/dsi_display.h index 844690ae50..78aadc0661 100644 --- a/msm/dsi/dsi_display.h +++ b/msm/dsi/dsi_display.h @@ -13,6 +13,7 @@ #include #include #include +#include #include "msm_drv.h" #include "dsi_defs.h" diff --git a/msm/dsi/dsi_drm.c b/msm/dsi/dsi_drm.c index 44d5e4c5c9..44d96ee4c2 100644 --- a/msm/dsi/dsi_drm.c +++ b/msm/dsi/dsi_drm.c @@ -149,7 +149,8 @@ void dsi_convert_to_drm_mode(const struct dsi_display_mode *dsi_mode, video_mode ? "vid" : "cmd"); } -static int dsi_bridge_attach(struct drm_bridge *bridge) +static int dsi_bridge_attach(struct drm_bridge *bridge, + enum drm_bridge_attach_flags flags) { struct dsi_bridge *c_bridge = to_dsi_bridge(bridge); @@ -1123,7 +1124,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(encoder, &bridge->base, NULL); + rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0); if (rc) { DSI_ERR("failed to attach bridge, rc=%d\n", rc); goto error_free_bridge; diff --git a/msm/msm_drv.h b/msm/msm_drv.h index 2c417ed21a..245d04245c 100644 --- a/msm/msm_drv.h +++ b/msm/msm_drv.h @@ -47,6 +47,7 @@ #include #include #include +#include #include "sde_power_handle.h" diff --git a/msm/sde/sde_encoder.h b/msm/sde/sde_encoder.h index b5d791ae96..8edfbe98c9 100644 --- a/msm/sde/sde_encoder.h +++ b/msm/sde/sde_encoder.h @@ -20,6 +20,7 @@ #define __SDE_ENCODER_H__ #include +#include #include #include "msm_prop.h"