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

Commit 9cc7610a authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: rename win_commit/disable to atomic-like names 



Rename win_commit() helper to update_plane() and win_disable() to
disable_plane().

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent f59a89d0

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ static void decon_shadow_protect_win(struct decon_context *ctx, int win, 
	writel(val, ctx->addr + DECON_SHADOWCON);

}



static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win)

static void decon_update_plane(struct exynos_drm_crtc *crtc, unsigned int win)

{

	struct decon_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;
@@ -277,7 +277,7 @@ static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) 
		atomic_set(&ctx->win_updated, 1);

}



static void decon_win_disable(struct exynos_drm_crtc *crtc, unsigned int win)

static void decon_disable_plane(struct exynos_drm_crtc *crtc, unsigned int win)

{

	struct decon_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;
@@ -378,7 +378,7 @@ static void decon_disable(struct exynos_drm_crtc *crtc) 
	 * a destroyed buffer later.

	 */

	for (i = 0; i < WINDOWS_NR; i++)

		decon_win_disable(crtc, i);

		decon_disable_plane(crtc, i);



	decon_swreset(ctx);
@@ -460,8 +460,8 @@ static struct exynos_drm_crtc_ops decon_crtc_ops = { 
	.enable_vblank		= decon_enable_vblank,

	.disable_vblank		= decon_disable_vblank,

	.commit			= decon_commit,

	.win_commit		= decon_win_commit,

	.win_disable		= decon_win_disable,

	.update_plane		= decon_update_plane,

	.disable_plane		= decon_disable_plane,

	.te_handler		= decon_te_irq_handler,

};

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ static void decon_shadow_protect_win(struct decon_context *ctx, 
	writel(val, ctx->regs + SHADOWCON);

}



static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win)

static void decon_update_plane(struct exynos_drm_crtc *crtc, unsigned int win)

{

	struct decon_context *ctx = crtc->ctx;

	struct drm_display_mode *mode = &crtc->base.state->adjusted_mode;
@@ -493,7 +493,7 @@ static void decon_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) 
	writel(val, ctx->regs + DECON_UPDATE);

}



static void decon_win_disable(struct exynos_drm_crtc *crtc, unsigned int win)

static void decon_disable_plane(struct exynos_drm_crtc *crtc, unsigned int win)

{

	struct decon_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;
@@ -599,7 +599,7 @@ static void decon_disable(struct exynos_drm_crtc *crtc) 
	 * a destroyed buffer later.

	 */

	for (i = 0; i < WINDOWS_NR; i++)

		decon_win_disable(crtc, i);

		decon_disable_plane(crtc, i);



	clk_disable_unprepare(ctx->vclk);

	clk_disable_unprepare(ctx->eclk);
@@ -619,8 +619,8 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { 
	.enable_vblank = decon_enable_vblank,

	.disable_vblank = decon_disable_vblank,

	.wait_for_vblank = decon_wait_for_vblank,

	.win_commit = decon_win_commit,

	.win_disable = decon_win_disable,

	.update_plane = decon_update_plane,

	.disable_plane = decon_disable_plane,

};

drivers/gpu/drm/exynos/exynos_drm_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ struct exynos_drm_display { 
 * @disable_vblank: specific driver callback for disabling vblank interrupt.

 * @wait_for_vblank: wait for vblank interrupt to make sure that

 *	hardware overlay is updated.

 * @win_commit: apply hardware specific overlay data to registers.

 * @win_disable: disable hardware specific overlay.

 * @update_plane: apply hardware specific overlay data to registers.

 * @disable_plane: disable hardware specific overlay.

 * @te_handler: trigger to transfer video image at the tearing effect

 *	synchronization signal if there is a page flip request.

 * @clock_enable: optional function enabling/disabling display domain clock,
@@ -173,8 +173,8 @@ struct exynos_drm_crtc_ops { 
	int (*enable_vblank)(struct exynos_drm_crtc *crtc);

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

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

	void (*win_commit)(struct exynos_drm_crtc *crtc, unsigned int zpos);

	void (*win_disable)(struct exynos_drm_crtc *crtc, unsigned int zpos);

	void (*update_plane)(struct exynos_drm_crtc *crtc, unsigned int zpos);

	void (*disable_plane)(struct exynos_drm_crtc *crtc, unsigned int zpos);

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

	void (*clock_enable)(struct exynos_drm_crtc *crtc, bool enable);

};

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+5 −5
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static void fimd_shadow_protect_win(struct fimd_context *ctx, 
	writel(val, ctx->regs + reg);

}



static void fimd_win_commit(struct exynos_drm_crtc *crtc, unsigned int win)

static void fimd_update_plane(struct exynos_drm_crtc *crtc, unsigned int win)

{

	struct fimd_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;
@@ -715,7 +715,7 @@ static void fimd_win_commit(struct exynos_drm_crtc *crtc, unsigned int win) 
		atomic_set(&ctx->win_updated, 1);

}



static void fimd_win_disable(struct exynos_drm_crtc *crtc, unsigned int win)

static void fimd_disable_plane(struct exynos_drm_crtc *crtc, unsigned int win)

{

	struct fimd_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;
@@ -785,7 +785,7 @@ static void fimd_disable(struct exynos_drm_crtc *crtc) 
	 * a destroyed buffer later.

	 */

	for (i = 0; i < WINDOWS_NR; i++)

		fimd_win_disable(crtc, i);

		fimd_disable_plane(crtc, i);



	fimd_enable_vblank(crtc);

	fimd_wait_for_vblank(crtc);
@@ -880,8 +880,8 @@ static const struct exynos_drm_crtc_ops fimd_crtc_ops = { 
	.enable_vblank = fimd_enable_vblank,

	.disable_vblank = fimd_disable_vblank,

	.wait_for_vblank = fimd_wait_for_vblank,

	.win_commit = fimd_win_commit,

	.win_disable = fimd_win_disable,

	.update_plane = fimd_update_plane,

	.disable_plane = fimd_disable_plane,

	.te_handler = fimd_te_handler,

	.clock_enable = fimd_dp_clock_enable,

};

drivers/gpu/drm/exynos/exynos_drm_plane.c

+5 −5
Original line number Diff line number Diff line
@@ -179,8 +179,8 @@ static void exynos_plane_atomic_update(struct drm_plane *plane, 
			      state->src_x >> 16, state->src_y >> 16,

			      state->src_w >> 16, state->src_h >> 16);



	if (exynos_crtc->ops->win_commit)

		exynos_crtc->ops->win_commit(exynos_crtc, exynos_plane->zpos);

	if (exynos_crtc->ops->update_plane)

		exynos_crtc->ops->update_plane(exynos_crtc, exynos_plane->zpos);

}



static void exynos_plane_atomic_disable(struct drm_plane *plane,
@@ -192,8 +192,8 @@ static void exynos_plane_atomic_disable(struct drm_plane *plane, 
	if (!old_state->crtc)

		return;



	if (exynos_crtc->ops->win_disable)

		exynos_crtc->ops->win_disable(exynos_crtc,

	if (exynos_crtc->ops->disable_plane)

		exynos_crtc->ops->disable_plane(exynos_crtc,

						exynos_plane->zpos);

}