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

Commit c7954aa6 authored by Andrzej Hajda's avatar Andrzej Hajda Committed by Inki Dae
Browse files

drm/exynos: kill mode_set_nofb callback 



All Exynos CRTCs are fully configured by .enable callback. The only users
of mode_set_nofb actually did nothing in their callbacks - they immediately
returned because devices were in suspend state - mode_set_nofb is always
called on disabled device.

Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 2949390e

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -581,7 +581,6 @@ static void decon_disable(struct exynos_drm_crtc *crtc) 
static const struct exynos_drm_crtc_ops decon_crtc_ops = {

static const struct exynos_drm_crtc_ops decon_crtc_ops = {

	.enable = decon_enable,

	.enable = decon_enable,

	.disable = decon_disable,

	.disable = decon_disable,

	.commit = decon_commit,

	.enable_vblank = decon_enable_vblank,

	.enable_vblank = decon_enable_vblank,

	.disable_vblank = decon_disable_vblank,

	.disable_vblank = decon_disable_vblank,

	.atomic_begin = decon_atomic_begin,

	.atomic_begin = decon_atomic_begin,

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -49,15 +49,6 @@ static void exynos_drm_crtc_disable(struct drm_crtc *crtc) 
	}

	}

}

}





static void

exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->commit)

		exynos_crtc->ops->commit(exynos_crtc);

}



static int exynos_crtc_atomic_check(struct drm_crtc *crtc,

static int exynos_crtc_atomic_check(struct drm_crtc *crtc,

				     struct drm_crtc_state *state)

				     struct drm_crtc_state *state)

{

{
@@ -93,7 +84,6 @@ static void exynos_crtc_atomic_flush(struct drm_crtc *crtc, 
static const struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {

static const struct drm_crtc_helper_funcs exynos_crtc_helper_funcs = {

	.enable		= exynos_drm_crtc_enable,

	.enable		= exynos_drm_crtc_enable,

	.disable	= exynos_drm_crtc_disable,

	.disable	= exynos_drm_crtc_disable,

	.mode_set_nofb	= exynos_drm_crtc_mode_set_nofb,

	.atomic_check	= exynos_crtc_atomic_check,

	.atomic_check	= exynos_crtc_atomic_check,

	.atomic_begin	= exynos_crtc_atomic_begin,

	.atomic_begin	= exynos_crtc_atomic_begin,

	.atomic_flush	= exynos_crtc_atomic_flush,

	.atomic_flush	= exynos_crtc_atomic_flush,

drivers/gpu/drm/exynos/exynos_drm_drv.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -115,7 +115,6 @@ struct exynos_drm_plane_config { 
 *

 *

 * @enable: enable the device

 * @enable: enable the device

 * @disable: disable the device

 * @disable: disable the device

 * @commit: set current hw specific display mode to hw.

 * @enable_vblank: specific driver callback for enabling vblank interrupt.

 * @enable_vblank: specific driver callback for enabling vblank interrupt.

 * @disable_vblank: specific driver callback for disabling vblank interrupt.

 * @disable_vblank: specific driver callback for disabling vblank interrupt.

 * @atomic_check: validate state

 * @atomic_check: validate state
@@ -130,7 +129,6 @@ struct exynos_drm_crtc; 
struct exynos_drm_crtc_ops {

struct exynos_drm_crtc_ops {

	void (*enable)(struct exynos_drm_crtc *crtc);

	void (*enable)(struct exynos_drm_crtc *crtc);

	void (*disable)(struct exynos_drm_crtc *crtc);

	void (*disable)(struct exynos_drm_crtc *crtc);

	void (*commit)(struct exynos_drm_crtc *crtc);

	int (*enable_vblank)(struct exynos_drm_crtc *crtc);

	int (*enable_vblank)(struct exynos_drm_crtc *crtc);

	void (*disable_vblank)(struct exynos_drm_crtc *crtc);

	void (*disable_vblank)(struct exynos_drm_crtc *crtc);

	u32 (*get_vblank_counter)(struct exynos_drm_crtc *crtc);

	u32 (*get_vblank_counter)(struct exynos_drm_crtc *crtc);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -928,7 +928,6 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable) 
static const struct exynos_drm_crtc_ops fimd_crtc_ops = {

static const struct exynos_drm_crtc_ops fimd_crtc_ops = {

	.enable = fimd_enable,

	.enable = fimd_enable,

	.disable = fimd_disable,

	.disable = fimd_disable,

	.commit = fimd_commit,

	.enable_vblank = fimd_enable_vblank,

	.enable_vblank = fimd_enable_vblank,

	.disable_vblank = fimd_disable_vblank,

	.disable_vblank = fimd_disable_vblank,

	.atomic_begin = fimd_atomic_begin,

	.atomic_begin = fimd_atomic_begin,