Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b20a0f8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Daniel Vetter
Browse files

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: default avatarLaurent 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: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170630093646.7928-2-laurent.pinchart+renesas@ideasonboard.com
parent f1e8c671

drivers/gpu/drm/arc/arcpgu_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -119,7 +119,8 @@ static void arc_pgu_crtc_mode_set_nofb(struct drm_crtc *crtc) 
	clk_set_rate(arcpgu->clk, m->crtc_clock * 1000);

}



static void arc_pgu_crtc_enable(struct drm_crtc *crtc)

static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc,

				       struct drm_crtc_state *old_state)

{

	struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
@@ -161,9 +162,9 @@ static const struct drm_crtc_helper_funcs arc_pgu_crtc_helper_funcs = { 
	.mode_set	= drm_helper_crtc_mode_set,

	.mode_set_base	= drm_helper_crtc_mode_set_base,

	.mode_set_nofb	= arc_pgu_crtc_mode_set_nofb,

	.enable		= arc_pgu_crtc_enable,

	.disable	= arc_pgu_crtc_disable,

	.atomic_begin	= arc_pgu_crtc_atomic_begin,

	.atomic_enable	= arc_pgu_crtc_atomic_enable,

};



static void arc_pgu_plane_atomic_update(struct drm_plane *plane,

drivers/gpu/drm/arm/hdlcd_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) 
	clk_set_rate(hdlcd->clk, m->crtc_clock * 1000);

}



static void hdlcd_crtc_enable(struct drm_crtc *crtc)

static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc,

				     struct drm_crtc_state *old_state)

{

	struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
@@ -218,10 +219,10 @@ static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc, 
}



static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = {

	.enable		= hdlcd_crtc_enable,

	.disable	= hdlcd_crtc_disable,

	.atomic_check	= hdlcd_crtc_atomic_check,

	.atomic_begin	= hdlcd_crtc_atomic_begin,

	.atomic_enable	= hdlcd_crtc_atomic_enable,

};



static int hdlcd_plane_atomic_check(struct drm_plane *plane,

drivers/gpu/drm/arm/malidp_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ static enum drm_mode_status malidp_crtc_mode_valid(struct drm_crtc *crtc, 
	return MODE_OK;

}



static void malidp_crtc_enable(struct drm_crtc *crtc)

static void malidp_crtc_atomic_enable(struct drm_crtc *crtc,

				      struct drm_crtc_state *old_state)

{

	struct malidp_drm *malidp = crtc_to_malidp_device(crtc);

	struct malidp_hw_device *hwdev = malidp->dev;
@@ -408,9 +409,9 @@ static int malidp_crtc_atomic_check(struct drm_crtc *crtc, 


static const struct drm_crtc_helper_funcs malidp_crtc_helper_funcs = {

	.mode_valid = malidp_crtc_mode_valid,

	.enable = malidp_crtc_enable,

	.disable = malidp_crtc_disable,

	.atomic_check = malidp_crtc_atomic_check,

	.atomic_enable = malidp_crtc_atomic_enable,

};



static struct drm_crtc_state *malidp_crtc_duplicate_state(struct drm_crtc *crtc)

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -183,7 +183,8 @@ static void atmel_hlcdc_crtc_disable(struct drm_crtc *c) 
	pm_runtime_put_sync(dev->dev);

}



static void atmel_hlcdc_crtc_enable(struct drm_crtc *c)

static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c,

					   struct drm_crtc_state *old_state)

{

	struct drm_device *dev = c->dev;

	struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
@@ -320,10 +321,10 @@ static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { 
	.mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb,

	.mode_set_base = drm_helper_crtc_mode_set_base,

	.disable = atmel_hlcdc_crtc_disable,

	.enable = atmel_hlcdc_crtc_enable,

	.atomic_check = atmel_hlcdc_crtc_atomic_check,

	.atomic_begin = atmel_hlcdc_crtc_atomic_begin,

	.atomic_flush = atmel_hlcdc_crtc_atomic_flush,

	.atomic_enable = atmel_hlcdc_crtc_atomic_enable,

};



static void atmel_hlcdc_crtc_destroy(struct drm_crtc *c)

drivers/gpu/drm/drm_atomic_helper.c

+4 −3
Original line number Diff line number Diff line
@@ -1069,12 +1069,13 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
					      struct drm_atomic_state *old_state)

{

	struct drm_crtc *crtc;

	struct drm_crtc_state *old_crtc_state;

	struct drm_crtc_state *new_crtc_state;

	struct drm_connector *connector;

	struct drm_connector_state *new_conn_state;

	int i;



	for_each_new_crtc_in_state(old_state, crtc, new_crtc_state, i) {

	for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) {

		const struct drm_crtc_helper_funcs *funcs;



		/* Need to filter out CRTCs where only planes change. */
@@ -1090,8 +1091,8 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev, 
			DRM_DEBUG_ATOMIC("enabling [CRTC:%d:%s]\n",

					 crtc->base.id, crtc->name);



			if (funcs->enable)

				funcs->enable(crtc);

			if (funcs->atomic_enable)

				funcs->atomic_enable(crtc, old_crtc_state);

			else

				funcs->commit(crtc);

		}