diff options
| author | Rahul Sharma <rahul.sharma@samsung.com> | 2014-06-23 07:32:25 +0200 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2014-06-24 16:44:50 +0200 |
| commit | 5d39b9ee8b16b57fdbc065b91ebdd4ac03dab568 (patch) | |
| tree | 9cedf79dfdd5fd8cd4a92d379eeb00374f57ae5d /drivers | |
| parent | drm/exynos: soft reset mixer before reconfigure after power-on (diff) | |
| download | linux-5d39b9ee8b16b57fdbc065b91ebdd4ac03dab568.tar.xz linux-5d39b9ee8b16b57fdbc065b91ebdd4ac03dab568.zip | |
drm/exynos: enable vsync interrupt while waiting for vblank
mixer_wait_for_vblank function expects that the upcoming
vsync interrupt handler routine will clear the
wait_vsync_event atomic variable.
For this to happen, interrupts should be enabled and
disabled properly.
Signed-off-by: Rahul Sharma <rahul.sharma@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index 6f1858187e28..7529946d0a74 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c @@ -1019,6 +1019,8 @@ static void mixer_wait_for_vblank(struct exynos_drm_manager *mgr) } mutex_unlock(&mixer_ctx->mixer_mutex); + drm_vblank_get(mgr->crtc->dev, mixer_ctx->pipe); + atomic_set(&mixer_ctx->wait_vsync_event, 1); /* @@ -1029,6 +1031,8 @@ static void mixer_wait_for_vblank(struct exynos_drm_manager *mgr) !atomic_read(&mixer_ctx->wait_vsync_event), HZ/20)) DRM_DEBUG_KMS("vblank wait timed out.\n"); + + drm_vblank_put(mgr->crtc->dev, mixer_ctx->pipe); } static void mixer_window_suspend(struct exynos_drm_manager *mgr) |