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

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

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

drivers/gpu/drm/arc/arcpgu_crtc.c

+3 −2
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ static void arc_pgu_crtc_atomic_enable(struct drm_crtc *crtc, 
		      ARCPGU_CTRL_ENABLE_MASK);

}



static void arc_pgu_crtc_disable(struct drm_crtc *crtc)

static void arc_pgu_crtc_atomic_disable(struct drm_crtc *crtc,

					struct drm_crtc_state *old_state)

{

	struct arcpgu_drm_private *arcpgu = crtc_to_arcpgu_priv(crtc);
@@ -162,9 +163,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,

	.disable	= arc_pgu_crtc_disable,

	.atomic_begin	= arc_pgu_crtc_atomic_begin,

	.atomic_enable	= arc_pgu_crtc_atomic_enable,

	.atomic_disable	= arc_pgu_crtc_atomic_disable,

};



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
@@ -176,7 +176,8 @@ static void hdlcd_crtc_atomic_enable(struct drm_crtc *crtc, 
	drm_crtc_vblank_on(crtc);

}



static void hdlcd_crtc_disable(struct drm_crtc *crtc)

static void hdlcd_crtc_atomic_disable(struct drm_crtc *crtc,

				      struct drm_crtc_state *old_state)

{

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



static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = {

	.disable	= hdlcd_crtc_disable,

	.atomic_check	= hdlcd_crtc_atomic_check,

	.atomic_begin	= hdlcd_crtc_atomic_begin,

	.atomic_enable	= hdlcd_crtc_atomic_enable,

	.atomic_disable	= hdlcd_crtc_atomic_disable,

};



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
@@ -70,7 +70,8 @@ static void malidp_crtc_atomic_enable(struct drm_crtc *crtc, 
	drm_crtc_vblank_on(crtc);

}



static void malidp_crtc_disable(struct drm_crtc *crtc)

static void malidp_crtc_atomic_disable(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;
@@ -409,9 +410,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,

	.disable = malidp_crtc_disable,

	.atomic_check = malidp_crtc_atomic_check,

	.atomic_enable = malidp_crtc_atomic_enable,

	.atomic_disable = malidp_crtc_atomic_disable,

};



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
@@ -149,7 +149,8 @@ atmel_hlcdc_crtc_mode_valid(struct drm_crtc *c, 
	return atmel_hlcdc_dc_mode_valid(crtc->dc, mode);

}



static void atmel_hlcdc_crtc_disable(struct drm_crtc *c)

static void atmel_hlcdc_crtc_atomic_disable(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,11 +321,11 @@ static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = { 
	.mode_set = drm_helper_crtc_mode_set,

	.mode_set_nofb = atmel_hlcdc_crtc_mode_set_nofb,

	.mode_set_base = drm_helper_crtc_mode_set_base,

	.disable = atmel_hlcdc_crtc_disable,

	.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,

	.atomic_disable = atmel_hlcdc_crtc_atomic_disable,

};



static void atmel_hlcdc_crtc_destroy(struct drm_crtc *c)

drivers/gpu/drm/drm_simple_kms_helper.c

+3 −2
Original line number Diff line number Diff line
@@ -52,7 +52,8 @@ static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc, 
	pipe->funcs->enable(pipe, crtc->state);

}



static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc)

static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc,

					struct drm_crtc_state *old_state)

{

	struct drm_simple_display_pipe *pipe;
@@ -66,7 +67,7 @@ static void drm_simple_kms_crtc_disable(struct drm_crtc *crtc) 
static const struct drm_crtc_helper_funcs drm_simple_kms_crtc_helper_funcs = {

	.atomic_check = drm_simple_kms_crtc_check,

	.atomic_enable = drm_simple_kms_crtc_enable,

	.disable = drm_simple_kms_crtc_disable,

	.atomic_disable = drm_simple_kms_crtc_disable,

};



static const struct drm_crtc_funcs drm_simple_kms_crtc_funcs = {