diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index b9f8f68f01f9..b4def2b25cec 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c @@ -404,7 +404,8 @@ static void sti_hda_configure_awg(struct sti_hda *hda, u32 *awg_instr, int nb) hda_write(hda, 0, HDA_SYNC_AWGI + i * 4); } -static void sti_hda_disable(struct drm_bridge *bridge) +static void sti_hda_disable(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { struct sti_hda *hda = drm_bridge_to_sti_hda(bridge); u32 val; @@ -429,7 +430,8 @@ static void sti_hda_disable(struct drm_bridge *bridge) hda->enabled = false; } -static void sti_hda_pre_enable(struct drm_bridge *bridge) +static void sti_hda_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { struct sti_hda *hda = drm_bridge_to_sti_hda(bridge); u32 val, i, mode_idx; @@ -563,16 +565,20 @@ static void sti_hda_set_mode(struct drm_bridge *bridge, mode->clock * 1000); } -static void sti_hda_bridge_nope(struct drm_bridge *bridge) +static void sti_hda_bridge_nope(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { /* do nothing */ } static const struct drm_bridge_funcs sti_hda_bridge_funcs = { - .pre_enable = sti_hda_pre_enable, - .enable = sti_hda_bridge_nope, - .disable = sti_hda_disable, - .post_disable = sti_hda_bridge_nope, + .atomic_create_state = drm_atomic_helper_bridge_create_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_pre_enable = sti_hda_pre_enable, + .atomic_enable = sti_hda_bridge_nope, + .atomic_disable = sti_hda_disable, + .atomic_post_disable = sti_hda_bridge_nope, .mode_set = sti_hda_set_mode, };