aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/omapdrm/omap_crtc.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2017-06-30 05:36:44 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-06-30 08:53:14 -0400
commit0b20a0f8c3cb6f74fe326101b62eeb5e2c56a53c (patch)
treea0710ff9f78eca95996537f90f9b965e3ddc8823 /drivers/gpu/drm/omapdrm/omap_crtc.c
parentf1e8c67123cf171e2b0357e885e426328b241d7d (diff)
drm: Add old state pointer to CRTC .enable() helper function
The old state is useful for drivers that need to perform operations at enable time that depend on the transition between the old and new states. While at it, rename the operation to .atomic_enable() to be consistent with .atomic_disable(), as the .enable() operation is used by atomic helpers only. 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 imx-drm and mediatek Acked-by: Alexey Brodkin <abrodkin@synopsys.com> # for arcpgu Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> # for atmel-hlcdc Acked-by: Liviu Dudau <Liviu.Dudau@arm.com> # for hdlcd and mali-dp Acked-by: Stefan Agner <stefan@agner.ch> # for fsl-dcu 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-2-laurent.pinchart+renesas@ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_crtc.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_crtc.c5
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
359static void omap_crtc_enable(struct drm_crtc *crtc) 359static 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 = {
568static const struct drm_crtc_helper_funcs omap_crtc_helper_funcs = { 569static 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/* -----------------------------------------------------------------------------