summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInki Dae <inki.dae@samsung.com>2014-10-30 08:29:34 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:07 (GMT)
commitf8faa55d2ea536aa429f106cd8be095c407ed59c (patch)
treed2c8de6d3cfdf5585852bef91a13e19c5cf3a3ed
parent5b5c3ad3f500b8124eb650c80f4a0ad7303ed710 (diff)
downloadlinux-3.10-f8faa55d2ea536aa429f106cd8be095c407ed59c.zip
linux-3.10-f8faa55d2ea536aa429f106cd8be095c407ed59c.tar.gz
linux-3.10-f8faa55d2ea536aa429f106cd8be095c407ed59c.tar.bz2
Revert "drm/exynos: fimd: make a wait_for_vblank event to be handled in same period"
This reverts commit d69e45dccaea2e2da28751e0bdaeae67bba1aa78. Change-Id: I3600f9fc2d29f21c3a0726902f78fcf8d5dcd3d0 Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_fimd.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index 1500128..37583ae 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -165,7 +165,6 @@ struct fimd_context {
atomic_t wait_vsync_event;
atomic_t win_updated;
atomic_t triggering;
- atomic_t triggerred;
spinlock_t win_updated_lock;
struct exynos_drm_panel_info panel;
@@ -986,13 +985,6 @@ static int fimd_te_handler(struct exynos_drm_manager *mgr)
if (atomic_read(&ctx->triggering))
return 0;
-
- /* Handle wait for vblank request in case of in-trigger. */
- if (atomic_read(&ctx->triggerred)) {
- atomic_set(&ctx->triggerred, 0);
- drm_handle_vblank(ctx->drm_dev, ctx->pipe);
- }
-
spin_lock_irqsave(&ctx->win_updated_lock, flags);
/*
@@ -1003,7 +995,6 @@ static int fimd_te_handler(struct exynos_drm_manager *mgr)
atomic_set(&ctx->win_updated, 0);
spin_unlock_irqrestore(&ctx->win_updated_lock, flags);
- atomic_set(&ctx->triggerred, 1);
fimd_trigger(ctx->dev);
spin_lock_irqsave(&ctx->win_updated_lock, flags);