diff options
| -rw-r--r-- | drivers/gpu/drm/sti/sti_dvo.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index 7484d3c3f4ed..b48099468eb9 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c @@ -209,7 +209,8 @@ static void dvo_debugfs_init(struct sti_dvo *dvo, struct drm_minor *minor) minor->debugfs_root, minor); } -static void sti_dvo_disable(struct drm_bridge *bridge) +static void sti_dvo_disable(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { struct sti_dvo *dvo = bridge->driver_private; @@ -232,7 +233,8 @@ static void sti_dvo_disable(struct drm_bridge *bridge) dvo->enabled = false; } -static void sti_dvo_pre_enable(struct drm_bridge *bridge) +static void sti_dvo_pre_enable(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { struct sti_dvo *dvo = bridge->driver_private; struct dvo_config *config = dvo->config; @@ -320,16 +322,20 @@ static void sti_dvo_set_mode(struct drm_bridge *bridge, dvo->config = &rgb_24bit_de_cfg; } -static void sti_dvo_bridge_nope(struct drm_bridge *bridge) +static void sti_dvo_bridge_nope(struct drm_bridge *bridge, + struct drm_atomic_commit *commit) { /* do nothing */ } static const struct drm_bridge_funcs sti_dvo_bridge_funcs = { - .pre_enable = sti_dvo_pre_enable, - .enable = sti_dvo_bridge_nope, - .disable = sti_dvo_disable, - .post_disable = sti_dvo_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_dvo_pre_enable, + .atomic_enable = sti_dvo_bridge_nope, + .atomic_disable = sti_dvo_disable, + .atomic_post_disable = sti_dvo_bridge_nope, .mode_set = sti_dvo_set_mode, }; |