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

Commit 47a7deff authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: atomic phase 3: use atomic .set_config helper 



Now that phase 1 and 2 are complete switch .set_config helper to
use the atomic one.

v2: also remove .prepare() callback

v3: remove .mode_set() and .mode_set_base() and encoder's
.prepare() callbacks

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Tested-by: default avatarTobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 910874a8

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −9
Original line number Diff line number Diff line
@@ -50,11 +50,6 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode) 
		drm_crtc_vblank_on(crtc);

}



static void exynos_drm_crtc_prepare(struct drm_crtc *crtc)

{

	/* drm framework doesn't check NULL. */

}



static void exynos_drm_crtc_commit(struct drm_crtc *crtc)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
@@ -108,12 +103,9 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) 


static struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {

	.dpms		= exynos_drm_crtc_dpms,

	.prepare	= exynos_drm_crtc_prepare,

	.commit		= exynos_drm_crtc_commit,

	.mode_fixup	= exynos_drm_crtc_mode_fixup,

	.mode_set	= drm_helper_crtc_mode_set,

	.mode_set_nofb	= exynos_drm_crtc_mode_set_nofb,

	.mode_set_base	= drm_helper_crtc_mode_set_base,

	.disable	= exynos_drm_crtc_disable,

};
@@ -190,7 +182,7 @@ static void exynos_drm_crtc_destroy(struct drm_crtc *crtc) 
}



static struct drm_crtc_funcs exynos_crtc_funcs = {

	.set_config	= drm_crtc_helper_set_config,

	.set_config	= drm_atomic_helper_set_config,

	.page_flip	= exynos_drm_crtc_page_flip,

	.destroy	= exynos_drm_crtc_destroy,

	.reset = drm_atomic_helper_crtc_reset,

drivers/gpu/drm/exynos/exynos_drm_encoder.c

+0 −6
Original line number Diff line number Diff line
@@ -76,11 +76,6 @@ static void exynos_drm_encoder_mode_set(struct drm_encoder *encoder, 
		display->ops->mode_set(display, adjusted_mode);

}



static void exynos_drm_encoder_prepare(struct drm_encoder *encoder)

{

	/* drm framework doesn't check NULL. */

}



static void exynos_drm_encoder_commit(struct drm_encoder *encoder)

{

	struct exynos_drm_encoder *exynos_encoder = to_exynos_encoder(encoder);
@@ -111,7 +106,6 @@ static struct drm_encoder_helper_funcs exynos_encoder_helper_funcs = { 
	.dpms		= exynos_drm_encoder_dpms,

	.mode_fixup	= exynos_drm_encoder_mode_fixup,

	.mode_set	= exynos_drm_encoder_mode_set,

	.prepare	= exynos_drm_encoder_prepare,

	.commit		= exynos_drm_encoder_commit,

	.disable	= exynos_drm_encoder_disable,

};