Skip to content

Commit 8ae7192

Browse files
committed
drm/msm/hdmi: switch to atomic bridge callbacks
Change MSM HDMI bridge to use atomic_* callbacks in preparation to enablign the HDMI connector support. Acked-by: Maxime Ripard <[email protected]> Reviewed-by: Abhinav Kumar <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Patchwork: https://patchwork.freedesktop.org/patch/639653/ Link: https://lore.kernel.org/r/[email protected]
1 parent e8cd822 commit 8ae7192

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

drivers/gpu/drm/msm/hdmi/hdmi_bridge.c

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi)
126126
hdmi_write(hdmi, REG_HDMI_INFOFRAME_CTRL1, val);
127127
}
128128

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)
130131
{
131132
struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
132133
struct hdmi *hdmi = hdmi_bridge->hdmi;
@@ -152,7 +153,8 @@ static void msm_hdmi_bridge_pre_enable(struct drm_bridge *bridge)
152153
msm_hdmi_hdcp_on(hdmi->hdcp_ctrl);
153154
}
154155

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)
156158
{
157159
struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);
158160
struct hdmi *hdmi = hdmi_bridge->hdmi;
@@ -299,8 +301,11 @@ static enum drm_mode_status msm_hdmi_bridge_mode_valid(struct drm_bridge *bridge
299301
}
300302

301303
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,
304309
.mode_set = msm_hdmi_bridge_mode_set,
305310
.mode_valid = msm_hdmi_bridge_mode_valid,
306311
.edid_read = msm_hdmi_bridge_edid_read,

0 commit comments

Comments
 (0)