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

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

drm/exynos/decon5433: implement frame counter 



DECON in Exynos5433 has frame counter, it can be used to implement
get_vblank_counter callback.

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

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+12 −0
Original line number Diff line number Diff line
@@ -166,6 +166,16 @@ static u32 decon_get_frame_count(struct decon_context *ctx, bool end) 
	return frm;

}



static u32 decon_get_vblank_counter(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;



	if (test_bit(BIT_SUSPENDED, &ctx->flags))

		return 0;



	return decon_get_frame_count(ctx, false);

}



static void decon_setup_trigger(struct decon_context *ctx)

{

	if (!(ctx->out_type & (IFTYPE_I80 | I80_HW_TRG)))
@@ -564,6 +574,7 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { 
	.disable		= decon_disable,

	.enable_vblank		= decon_enable_vblank,

	.disable_vblank		= decon_disable_vblank,

	.get_vblank_counter	= decon_get_vblank_counter,

	.atomic_begin		= decon_atomic_begin,

	.update_plane		= decon_update_plane,

	.disable_plane		= decon_disable_plane,
@@ -583,6 +594,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 


	ctx->drm_dev = drm_dev;

	ctx->pipe = priv->pipe++;

	drm_dev->max_vblank_count = 0xffffffff;



	for (win = ctx->first_win; win < WINDOWS_NR; win++) {

		int tmp = (win == ctx->first_win) ? 0 : win;

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+11 −0
Original line number Diff line number Diff line
@@ -142,6 +142,16 @@ static void exynos_drm_crtc_disable_vblank(struct drm_crtc *crtc) 
		exynos_crtc->ops->disable_vblank(exynos_crtc);

}



static u32 exynos_drm_crtc_get_vblank_counter(struct drm_crtc *crtc)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->get_vblank_counter)

		return exynos_crtc->ops->get_vblank_counter(exynos_crtc);



	return 0;

}



static const struct drm_crtc_funcs exynos_crtc_funcs = {

	.set_config	= drm_atomic_helper_set_config,

	.page_flip	= drm_atomic_helper_page_flip,
@@ -151,6 +161,7 @@ static const struct drm_crtc_funcs exynos_crtc_funcs = { 
	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

	.enable_vblank = exynos_drm_crtc_enable_vblank,

	.disable_vblank = exynos_drm_crtc_disable_vblank,

	.get_vblank_counter = exynos_drm_crtc_get_vblank_counter,

};



struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,

drivers/gpu/drm/exynos/exynos_drm_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct exynos_drm_crtc_ops { 
	void (*commit)(struct exynos_drm_crtc *crtc);

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

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

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

	int (*atomic_check)(struct exynos_drm_crtc *crtc,

			    struct drm_crtc_state *state);

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