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

Commit 4f452c01 authored by Inki Dae's avatar Inki Dae Committed by Inki Dae
Browse files

drm/exynos: clean up wait_for_vblank 



This patch cleans up wait_for_vblank relevant codes.
wait_for_vblank callback isn't used anymore in Exynos drm driver
so it removes relevant codes. However, display controllers -
FIMD and DECON - still use this function driver internally
to ensure shadow registers to be updated, which resolves
page fault issue so keep it.

Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 48f6155a

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+0 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ static const struct exynos_drm_crtc_ops decon_crtc_ops = { 
	.commit = decon_commit,

	.enable_vblank = decon_enable_vblank,

	.disable_vblank = decon_disable_vblank,

	.wait_for_vblank = decon_wait_for_vblank,

	.atomic_begin = decon_atomic_begin,

	.update_plane = decon_update_plane,

	.disable_plane = decon_disable_plane,

drivers/gpu/drm/exynos/exynos_drm_drv.h

+0 −3
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ struct exynos_drm_plane_config { 
 * @commit: set current hw specific display mode to hw.

 * @enable_vblank: specific driver callback for enabling vblank interrupt.

 * @disable_vblank: specific driver callback for disabling vblank interrupt.

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

 *	hardware overlay is updated.

 * @atomic_check: validate state

 * @atomic_begin: prepare device to receive an update

 * @atomic_flush: mark the end of device update
@@ -137,7 +135,6 @@ 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);

	void (*wait_for_vblank)(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);

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+0 −1
Original line number Diff line number Diff line
@@ -888,7 +888,6 @@ static const struct exynos_drm_crtc_ops fimd_crtc_ops = { 
	.commit = fimd_commit,

	.enable_vblank = fimd_enable_vblank,

	.disable_vblank = fimd_disable_vblank,

	.wait_for_vblank = fimd_wait_for_vblank,

	.atomic_begin = fimd_atomic_begin,

	.update_plane = fimd_update_plane,

	.disable_plane = fimd_disable_plane,

drivers/gpu/drm/exynos/exynos_mixer.c

+0 −39
Original line number Diff line number Diff line
@@ -104,8 +104,6 @@ struct mixer_context { 


	struct mixer_resources	mixer_res;

	enum mixer_version_id	mxr_ver;

	wait_queue_head_t	wait_vsync_queue;

	atomic_t		wait_vsync_event;

};



struct mixer_drv_data {
@@ -788,12 +786,6 @@ static irqreturn_t mixer_irq_handler(int irq, void *arg) 


			exynos_drm_crtc_finish_update(ctx->crtc, plane);

		}



		/* set wait vsync event to zero and wake up queue. */

		if (atomic_read(&ctx->wait_vsync_event)) {

			atomic_set(&ctx->wait_vsync_event, 0);

			wake_up(&ctx->wait_vsync_queue);

		}

	}



out:
@@ -1028,34 +1020,6 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc) 
	mixer_vsync_set_update(mixer_ctx, true);

}



static void mixer_wait_for_vblank(struct exynos_drm_crtc *crtc)

{

	struct mixer_context *mixer_ctx = crtc->ctx;

	int err;



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

		return;



	err = drm_vblank_get(mixer_ctx->drm_dev, mixer_ctx->pipe);

	if (err < 0) {

		DRM_DEBUG_KMS("failed to acquire vblank counter\n");

		return;

	}



	atomic_set(&mixer_ctx->wait_vsync_event, 1);



	/*

	 * wait for MIXER to signal VSYNC interrupt or return after

	 * timeout which is set to 50ms (refresh rate of 20).

	 */

	if (!wait_event_timeout(mixer_ctx->wait_vsync_queue,

				!atomic_read(&mixer_ctx->wait_vsync_event),

				HZ/20))

		DRM_DEBUG_KMS("vblank wait timed out.\n");



	drm_vblank_put(mixer_ctx->drm_dev, mixer_ctx->pipe);

}



static void mixer_enable(struct exynos_drm_crtc *crtc)

{

	struct mixer_context *ctx = crtc->ctx;
@@ -1131,7 +1095,6 @@ static const struct exynos_drm_crtc_ops mixer_crtc_ops = { 
	.disable		= mixer_disable,

	.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,
@@ -1253,8 +1216,6 @@ static int mixer_probe(struct platform_device *pdev) 
	ctx->vp_enabled = drv->is_vp_enabled;

	ctx->has_sclk = drv->has_sclk;

	ctx->mxr_ver = drv->version;

	init_waitqueue_head(&ctx->wait_vsync_queue);

	atomic_set(&ctx->wait_vsync_event, 0);



	platform_set_drvdata(pdev, ctx);