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

Commit 3dbaab16 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Inki Dae
Browse files

drm/exynos: mixer: properly update all planes on the same vblank event 



This patch also moves mixer_vsync_set_update() to newly introduced
mixer_atomic_begin/flush callbacks. This ensures that all mixer planes
will be updated on the same vsync event.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent d29c2c14

drivers/gpu/drm/exynos/exynos_mixer.c

+25 −9
Original line number Diff line number Diff line
@@ -516,7 +516,6 @@ static void vp_video_buffer(struct mixer_context *ctx, 
	}



	spin_lock_irqsave(&res->reg_slock, flags);

	mixer_vsync_set_update(ctx, false);



	/* interlace or progressive scan mode */

	val = (ctx->interlace ? ~0 : 0);
@@ -567,7 +566,6 @@ static void vp_video_buffer(struct mixer_context *ctx, 
	mixer_cfg_vp_blend(ctx);

	mixer_run(ctx);



	mixer_vsync_set_update(ctx, true);

	spin_unlock_irqrestore(&res->reg_slock, flags);



	mixer_regs_dump(ctx);
@@ -642,7 +640,6 @@ static void mixer_graph_buffer(struct mixer_context *ctx, 
		ctx->interlace = false;



	spin_lock_irqsave(&res->reg_slock, flags);

	mixer_vsync_set_update(ctx, false);



	/* setup format */

	mixer_reg_writemask(res, MXR_GRAPHIC_CFG(win),
@@ -691,7 +688,6 @@ static void mixer_graph_buffer(struct mixer_context *ctx, 


	mixer_run(ctx);



	mixer_vsync_set_update(ctx, true);

	spin_unlock_irqrestore(&res->reg_slock, flags);



	mixer_regs_dump(ctx);
@@ -718,7 +714,6 @@ static void mixer_win_reset(struct mixer_context *ctx) 
	unsigned long flags;



	spin_lock_irqsave(&res->reg_slock, flags);

	mixer_vsync_set_update(ctx, false);



	mixer_reg_writemask(res, MXR_CFG, MXR_CFG_DST_HDMI, MXR_CFG_DST_MASK);
@@ -749,7 +744,6 @@ static void mixer_win_reset(struct mixer_context *ctx) 
	if (ctx->vp_enabled)

		mixer_reg_writemask(res, MXR_CFG, 0, MXR_CFG_VP_ENABLE);



	mixer_vsync_set_update(ctx, true);

	spin_unlock_irqrestore(&res->reg_slock, flags);

}
@@ -980,6 +974,16 @@ static void mixer_disable_vblank(struct exynos_drm_crtc *crtc) 
	mixer_reg_writemask(res, MXR_INT_EN, 0, MXR_INT_EN_VSYNC);

}



static void mixer_atomic_begin(struct exynos_drm_crtc *crtc)

{

	struct mixer_context *mixer_ctx = crtc->ctx;



	if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))

		return;



	mixer_vsync_set_update(mixer_ctx, false);

}



static void mixer_update_plane(struct exynos_drm_crtc *crtc,

			       struct exynos_drm_plane *plane)

{
@@ -1009,12 +1013,18 @@ static void mixer_disable_plane(struct exynos_drm_crtc *crtc, 
		return;



	spin_lock_irqsave(&res->reg_slock, flags);

	mixer_vsync_set_update(mixer_ctx, false);



	mixer_cfg_layer(mixer_ctx, plane->index, 0, false);

	spin_unlock_irqrestore(&res->reg_slock, flags);

}



static void mixer_atomic_flush(struct exynos_drm_crtc *crtc)

{

	struct mixer_context *mixer_ctx = crtc->ctx;



	if (!test_bit(MXR_BIT_POWERED, &mixer_ctx->flags))

		return;



	mixer_vsync_set_update(mixer_ctx, true);

	spin_unlock_irqrestore(&res->reg_slock, flags);

}



static void mixer_wait_for_vblank(struct exynos_drm_crtc *crtc)
@@ -1055,6 +1065,8 @@ static void mixer_enable(struct exynos_drm_crtc *crtc) 


	pm_runtime_get_sync(ctx->dev);



	mixer_vsync_set_update(ctx, false);



	mixer_reg_writemask(res, MXR_STATUS, ~0, MXR_STATUS_SOFT_RESET);



	if (test_bit(MXR_BIT_VSYNC, &ctx->flags)) {
@@ -1063,6 +1075,8 @@ static void mixer_enable(struct exynos_drm_crtc *crtc) 
	}

	mixer_win_reset(ctx);



	mixer_vsync_set_update(ctx, true);



	set_bit(MXR_BIT_POWERED, &ctx->flags);

}
@@ -1113,8 +1127,10 @@ static const struct exynos_drm_crtc_ops mixer_crtc_ops = { 
	.enable_vblank		= mixer_enable_vblank,

	.disable_vblank		= mixer_disable_vblank,

	.wait_for_vblank	= mixer_wait_for_vblank,

	.atomic_begin		= mixer_atomic_begin,

	.update_plane		= mixer_update_plane,

	.disable_plane		= mixer_disable_plane,

	.atomic_flush		= mixer_atomic_flush,

	.atomic_check		= mixer_atomic_check,

};