diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2017-06-30 05:36:45 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-06-30 08:53:15 -0400 |
commit | 64581714b58bc3e16ede8dc37a025c3aa0e0eef1 (patch) | |
tree | bd6006c2467114a4f2418bb811542710801f05f4 /drivers/gpu/drm/omapdrm/omap_crtc.c | |
parent | 0b20a0f8c3cb6f74fe326101b62eeb5e2c56a53c (diff) |
drm: Convert atomic drivers from CRTC .disable() to .atomic_disable()
The CRTC .disable() helper operation is deprecated for atomic drivers,
the new .atomic_disable() helper operation being preferred. Convert all
atomic drivers to .atomic_disable() to avoid cargo-cult use of
.disable() in new drivers.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> # for sun4i
Acked-by: Philipp Zabel <p.zabel@pengutronix.de> # for mediatek
Acked-by: Alexey Brodkin <abrodkin@synopsys.com> # for arcpgu
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> # for atmel-hlcdc
Tested-by: Philippe Cornu <philippe.cornu@st.com> # for stm
Acked-by: Philippe Cornu <philippe.cornu@st.com> # for stm
Acked-by: Vincent Abriou <vincent.abriou@st.com> # for sti
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> # for vmwgfx
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170630093646.7928-3-laurent.pinchart+renesas@ideasonboard.com
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 7a1b7a9cc270..14e8a7738b06 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c | |||
@@ -373,7 +373,8 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc, | |||
373 | spin_unlock_irq(&crtc->dev->event_lock); | 373 | spin_unlock_irq(&crtc->dev->event_lock); |
374 | } | 374 | } |
375 | 375 | ||
376 | static void omap_crtc_disable(struct drm_crtc *crtc) | 376 | static void omap_crtc_atomic_disable(struct drm_crtc *crtc, |
377 | struct drm_crtc_state *old_state) | ||
377 | { | 378 | { |
378 | struct omap_crtc *omap_crtc = to_omap_crtc(crtc); | 379 | struct omap_crtc *omap_crtc = to_omap_crtc(crtc); |
379 | 380 | ||
@@ -568,11 +569,11 @@ static const struct drm_crtc_funcs omap_crtc_funcs = { | |||
568 | 569 | ||
569 | static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { | 570 | static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { |
570 | .mode_set_nofb = omap_crtc_mode_set_nofb, | 571 | .mode_set_nofb = omap_crtc_mode_set_nofb, |
571 | .disable = omap_crtc_disable, | ||
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 | .atomic_enable = omap_crtc_atomic_enable, |
576 | .atomic_disable = omap_crtc_atomic_disable, | ||
576 | }; | 577 | }; |
577 | 578 | ||
578 | /* ----------------------------------------------------------------------------- | 579 | /* ----------------------------------------------------------------------------- |