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

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

drm/exynos: use KMS version of DRM vblanks functions 



Get rid of legacy DRM vblank function that are less clear to use.
The new ones basically requires only the crtc as parameters.

It also clean ups exynos_drm_crtc_finish_pageflip() parameters as a
consequence.

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 451a8c0c

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+3 −3
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ void decon_te_irq_handler(struct exynos_drm_crtc *crtc) 
		writel(val, ctx->addr + DECON_TRIGCON);

	}



	drm_handle_vblank(ctx->drm_dev, ctx->pipe);

	drm_crtc_handle_vblank(&ctx->crtc->base);

}



static void decon_clear_channels(struct exynos_drm_crtc *crtc)
@@ -533,7 +533,7 @@ static irqreturn_t decon_vsync_irq_handler(int irq, void *dev_id) 


	val = readl(ctx->addr + DECON_VIDINTCON1);

	if (val & VIDINTCON1_INTFRMPEND) {

		drm_handle_vblank(ctx->drm_dev, ctx->pipe);

		drm_crtc_handle_vblank(&ctx->crtc->base);



		/* clear */

		writel(VIDINTCON1_INTFRMPEND, ctx->addr + DECON_VIDINTCON1);
@@ -553,7 +553,7 @@ static irqreturn_t decon_lcd_sys_irq_handler(int irq, void *dev_id) 


	val = readl(ctx->addr + DECON_VIDINTCON1);

	if (val & VIDINTCON1_INTFRMDONEPEND) {

		exynos_drm_crtc_finish_pageflip(ctx->drm_dev, ctx->pipe);

		exynos_drm_crtc_finish_pageflip(ctx->crtc);



		/* clear */

		writel(VIDINTCON1_INTFRMDONEPEND,

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+2 −2
Original line number Diff line number Diff line
@@ -643,8 +643,8 @@ static irqreturn_t decon_irq_handler(int irq, void *dev_id) 
		goto out;



	if (!ctx->i80_if) {

		drm_handle_vblank(ctx->drm_dev, ctx->pipe);

		exynos_drm_crtc_finish_pageflip(ctx->drm_dev, ctx->pipe);

		drm_crtc_handle_vblank(&ctx->crtc->base);

		exynos_drm_crtc_finish_pageflip(ctx->crtc);



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

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

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+6 −8
Original line number Diff line number Diff line
@@ -195,24 +195,22 @@ void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int pipe) 
		exynos_crtc->ops->disable_vblank(exynos_crtc);

}



void exynos_drm_crtc_finish_pageflip(struct drm_device *dev, int pipe)

void exynos_drm_crtc_finish_pageflip(struct exynos_drm_crtc *exynos_crtc)

{

	struct exynos_drm_private *dev_priv = dev->dev_private;

	struct drm_crtc *drm_crtc = dev_priv->crtc[pipe];

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(drm_crtc);

	struct drm_crtc *crtc = &exynos_crtc->base;

	unsigned long flags;



	spin_lock_irqsave(&dev->event_lock, flags);

	spin_lock_irqsave(&crtc->dev->event_lock, flags);

	if (exynos_crtc->event) {



		drm_send_vblank_event(dev, pipe, exynos_crtc->event);

		drm_vblank_put(dev, pipe);

		drm_crtc_send_vblank_event(crtc, exynos_crtc->event);

		drm_crtc_vblank_put(crtc);

		wake_up(&exynos_crtc->pending_flip_queue);



	}



	exynos_crtc->event = NULL;

	spin_unlock_irqrestore(&dev->event_lock, flags);

	spin_unlock_irqrestore(&crtc->dev->event_lock, flags);

}



void exynos_drm_crtc_complete_scanout(struct drm_framebuffer *fb)

drivers/gpu/drm/exynos/exynos_drm_crtc.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev, 
					void *context);

int exynos_drm_crtc_enable_vblank(struct drm_device *dev, int pipe);

void exynos_drm_crtc_disable_vblank(struct drm_device *dev, int pipe);

void exynos_drm_crtc_finish_pageflip(struct drm_device *dev, int pipe);

void exynos_drm_crtc_finish_pageflip(struct exynos_drm_crtc *exynos_crtc);

void exynos_drm_crtc_complete_scanout(struct drm_framebuffer *fb);



/* This function gets pipe value to crtc device matched with out_type. */

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+4 −4
Original line number Diff line number Diff line
@@ -855,7 +855,7 @@ static void fimd_te_handler(struct exynos_drm_crtc *crtc) 
	}



	if (test_bit(0, &ctx->irq_flags))

		drm_handle_vblank(ctx->drm_dev, ctx->pipe);

		drm_crtc_handle_vblank(&ctx->crtc->base);

}



static void fimd_dp_clock_enable(struct exynos_drm_crtc *crtc, bool enable)
@@ -905,13 +905,13 @@ static irqreturn_t fimd_irq_handler(int irq, void *dev_id) 
		goto out;



	if (ctx->i80_if) {

		exynos_drm_crtc_finish_pageflip(ctx->drm_dev, ctx->pipe);

		exynos_drm_crtc_finish_pageflip(ctx->crtc);



		/* Exits triggering mode */

		atomic_set(&ctx->triggering, 0);

	} else {

		drm_handle_vblank(ctx->drm_dev, ctx->pipe);

		exynos_drm_crtc_finish_pageflip(ctx->drm_dev, ctx->pipe);

		drm_crtc_handle_vblank(&ctx->crtc->base);

		exynos_drm_crtc_finish_pageflip(ctx->crtc);



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

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