@@ -126,7 +126,8 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi)
126
126
hdmi_write (hdmi , REG_HDMI_INFOFRAME_CTRL1 , val );
127
127
}
128
128
129
- static void msm_hdmi_bridge_pre_enable (struct drm_bridge * bridge )
129
+ static void msm_hdmi_bridge_atomic_pre_enable (struct drm_bridge * bridge ,
130
+ struct drm_atomic_state * state )
130
131
{
131
132
struct hdmi_bridge * hdmi_bridge = to_hdmi_bridge (bridge );
132
133
struct hdmi * hdmi = hdmi_bridge -> hdmi ;
@@ -152,7 +153,8 @@ static void msm_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
152
153
msm_hdmi_hdcp_on (hdmi -> hdcp_ctrl );
153
154
}
154
155
155
- static void msm_hdmi_bridge_post_disable (struct drm_bridge * bridge )
156
+ static void msm_hdmi_bridge_atomic_post_disable (struct drm_bridge * bridge ,
157
+ struct drm_atomic_state * state )
156
158
{
157
159
struct hdmi_bridge * hdmi_bridge = to_hdmi_bridge (bridge );
158
160
struct hdmi * hdmi = hdmi_bridge -> hdmi ;
@@ -299,8 +301,11 @@ static enum drm_mode_status msm_hdmi_bridge_mode_valid(struct drm_bridge *bridge
299
301
}
300
302
301
303
static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = {
302
- .pre_enable = msm_hdmi_bridge_pre_enable ,
303
- .post_disable = msm_hdmi_bridge_post_disable ,
304
+ .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state ,
305
+ .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state ,
306
+ .atomic_reset = drm_atomic_helper_bridge_reset ,
307
+ .atomic_pre_enable = msm_hdmi_bridge_atomic_pre_enable ,
308
+ .atomic_post_disable = msm_hdmi_bridge_atomic_post_disable ,
304
309
.mode_set = msm_hdmi_bridge_mode_set ,
305
310
.mode_valid = msm_hdmi_bridge_mode_valid ,
306
311
.edid_read = msm_hdmi_bridge_edid_read ,
0 commit comments