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

Commit 1e1d1393 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: pass struct exynos_drm_plane in update/enable 



We already have the plane pointer in before calling .update_plane() or
disable_plane() so pass it directly to those calls avoiding a new
conversion from zpos to struct exynos_drm_plane.

v2: don't remove check for suspended in FIMD (comment by Joonyoung)

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 9cc7610a

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

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

}



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

static void decon_update_plane(struct exynos_drm_crtc *crtc,

			       struct exynos_drm_plane *plane)

{

	struct decon_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;

	unsigned int win = plane->zpos;

	u32 val;



	if (win < 0 || win >= WINDOWS_NR)

		return;



	plane = &ctx->planes[win];



	if (ctx->suspended)

		return;
@@ -277,17 +273,13 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, unsigned int win) 
		atomic_set(&ctx->win_updated, 1);

}



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

static void decon_disable_plane(struct exynos_drm_crtc *crtc,

				struct exynos_drm_plane *plane)

{

	struct decon_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;

	unsigned int win = plane->zpos;

	u32 val;



	if (win < 0 || win >= WINDOWS_NR)

		return;



	plane = &ctx->planes[win];



	if (ctx->suspended)

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

	 */

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

		decon_disable_plane(crtc, i);

		decon_disable_plane(crtc, &ctx->planes[i]);



	decon_swreset(ctx);

drivers/gpu/drm/exynos/exynos7_drm_decon.c

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

}



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

static void decon_update_plane(struct exynos_drm_crtc *crtc,

			       struct exynos_drm_plane *plane)

{

	struct decon_context *ctx = crtc->ctx;

	struct drm_display_mode *mode = &crtc->base.state->adjusted_mode;

	struct exynos_drm_plane *plane;

	int padding;

	unsigned long val, alpha;

	unsigned int last_x;

	unsigned int last_y;

	unsigned int win = plane->zpos;



	if (ctx->suspended)

		return;



	if (win < 0 || win >= WINDOWS_NR)

		return;



	plane = &ctx->planes[win];



	/*

	 * SHADOWCON/PRTCON register is used for enabling timing.

	 *
@@ -493,17 +489,13 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, unsigned int win) 
	writel(val, ctx->regs + DECON_UPDATE);

}



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

static void decon_disable_plane(struct exynos_drm_crtc *crtc,

				struct exynos_drm_plane *plane)

{

	struct decon_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;

	unsigned int win = plane->zpos;

	u32 val;



	if (win < 0 || win >= WINDOWS_NR)

		return;



	plane = &ctx->planes[win];



	if (ctx->suspended)

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

	 */

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

		decon_disable_plane(crtc, i);

		decon_disable_plane(crtc, &ctx->planes[i]);



	clk_disable_unprepare(ctx->vclk);

	clk_disable_unprepare(ctx->eclk);

drivers/gpu/drm/exynos/exynos_drm_drv.h

+4 −2
Original line number Diff line number Diff line
@@ -173,8 +173,10 @@ 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 (*update_plane)(struct exynos_drm_crtc *crtc, unsigned int zpos);

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

	void (*update_plane)(struct exynos_drm_crtc *crtc,

			     struct exynos_drm_plane *plane);

	void (*disable_plane)(struct exynos_drm_crtc *crtc,

			      struct exynos_drm_plane *plane);

	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

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

}



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

static void fimd_update_plane(struct exynos_drm_crtc *crtc,

			      struct exynos_drm_plane *plane)

{

	struct fimd_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;

	dma_addr_t dma_addr;

	unsigned long val, size, offset;

	unsigned int last_x, last_y, buf_offsize, line_size;

	unsigned int win = plane->zpos;



	if (ctx->suspended)

		return;



	if (win < 0 || win >= WINDOWS_NR)

		return;



	plane = &ctx->planes[win];



	/*

	 * SHADOWCON/PRTCON register is used for enabling timing.

	 *
@@ -715,15 +711,11 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc, unsigned int win) 
		atomic_set(&ctx->win_updated, 1);

}



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

static void fimd_disable_plane(struct exynos_drm_crtc *crtc,

			       struct exynos_drm_plane *plane)

{

	struct fimd_context *ctx = crtc->ctx;

	struct exynos_drm_plane *plane;



	if (win < 0 || win >= WINDOWS_NR)

		return;



	plane = &ctx->planes[win];

	unsigned int win = plane->zpos;



	if (ctx->suspended)

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

	 */

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

		fimd_disable_plane(crtc, i);

		fimd_disable_plane(crtc, &ctx->planes[i]);



	fimd_enable_vblank(crtc);

	fimd_wait_for_vblank(crtc);

drivers/gpu/drm/exynos/exynos_drm_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void exynos_plane_atomic_update(struct drm_plane *plane, 
			      state->src_w >> 16, state->src_h >> 16);



	if (exynos_crtc->ops->update_plane)

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

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

}



static void exynos_plane_atomic_disable(struct drm_plane *plane,
@@ -194,7 +194,7 @@ static void exynos_plane_atomic_disable(struct drm_plane *plane, 


	if (exynos_crtc->ops->disable_plane)

		exynos_crtc->ops->disable_plane(exynos_crtc,

						exynos_plane->zpos);

						exynos_plane);

}



static const struct drm_plane_helper_funcs plane_helper_funcs = {