diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_crtc.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_crtc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index dd0ef40ca469..7a1b7a9cc270 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c | |||
@@ -356,7 +356,8 @@ static void omap_crtc_arm_event(struct drm_crtc *crtc) | |||
356 | } | 356 | } |
357 | } | 357 | } |
358 | 358 | ||
359 | static void omap_crtc_enable(struct drm_crtc *crtc) | 359 | static void omap_crtc_atomic_enable(struct drm_crtc *crtc, |
360 | struct drm_crtc_state *old_state) | ||
360 | { | 361 | { |
361 | struct omap_crtc *omap_crtc = to_omap_crtc(crtc); | 362 | struct omap_crtc *omap_crtc = to_omap_crtc(crtc); |
362 | int ret; | 363 | int ret; |
@@ -568,10 +569,10 @@ static const struct drm_crtc_funcs omap_crtc_funcs = { | |||
568 | static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { | 569 | static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { |
569 | .mode_set_nofb = omap_crtc_mode_set_nofb, | 570 | .mode_set_nofb = omap_crtc_mode_set_nofb, |
570 | .disable = omap_crtc_disable, | 571 | .disable = omap_crtc_disable, |
571 | .enable = omap_crtc_enable, | ||
572 | .atomic_check = omap_crtc_atomic_check, | 572 | .atomic_check = omap_crtc_atomic_check, |
573 | .atomic_begin = omap_crtc_atomic_begin, | 573 | .atomic_begin = omap_crtc_atomic_begin, |
574 | .atomic_flush = omap_crtc_atomic_flush, | 574 | .atomic_flush = omap_crtc_atomic_flush, |
575 | .atomic_enable = omap_crtc_atomic_enable, | ||
575 | }; | 576 | }; |
576 | 577 | ||
577 | /* ----------------------------------------------------------------------------- | 578 | /* ----------------------------------------------------------------------------- |