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

Commit c6b1ef11 authored by Inki Dae's avatar Inki Dae Committed by Greg Kroah-Hartman
Browse files

Revert "drm/exynos/decon5433: implement frame counter" 



[ Upstream commit 6ca469e22a30992b4478d2ab88737c70667c1e00 ]

This reverts commit 0586feba

This patch makes it to need get_vblank_counter callback in crtc
to get frame counter from decon driver.

However, drm_dev->max_vblank_count is a member unique to
vendor's DRM driver but in case of ARM DRM, some CRTC devices
don't provide the frame counter value. As a result, this patch
made extension and clone mode not working.

Instead of this patch, we may need separated max_vblank_count
which belongs to each CRTC device, or need to implement frame
counter emulation for them who don't support HW frame counter.

Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 21eb778e

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+0 −9
Original line number Diff line number Diff line
@@ -160,13 +160,6 @@ 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;



	return decon_get_frame_count(ctx, false);

}



static void decon_setup_trigger(struct decon_context *ctx)

{

	if (!ctx->crtc->i80_mode && !(ctx->out_type & I80_HW_TRG))
@@ -532,7 +525,6 @@ 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,
@@ -550,7 +542,6 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
	int ret;



	ctx->drm_dev = drm_dev;

	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

+0 −11
Original line number Diff line number Diff line
@@ -147,16 +147,6 @@ 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,
@@ -166,7 +156,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ struct exynos_drm_crtc_ops { 
	void (*disable)(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);

	enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,

		const struct drm_display_mode *mode);

	int (*atomic_check)(struct exynos_drm_crtc *crtc,