|
@@ -69,8 +69,10 @@ static void exynos_drm_crtc_dpms(struct drm_crtc *crtc, int mode)
|
|
|
|
|
|
if (mode > DRM_MODE_DPMS_ON) {
|
|
if (mode > DRM_MODE_DPMS_ON) {
|
|
/* wait for the completion of page flip. */
|
|
/* wait for the completion of page flip. */
|
|
- wait_event(exynos_crtc->pending_flip_queue,
|
|
|
|
- atomic_read(&exynos_crtc->pending_flip) == 0);
|
|
|
|
|
|
+ if (!wait_event_timeout(exynos_crtc->pending_flip_queue,
|
|
|
|
+ !atomic_read(&exynos_crtc->pending_flip),
|
|
|
|
+ HZ/20))
|
|
|
|
+ atomic_set(&exynos_crtc->pending_flip, 0);
|
|
drm_vblank_off(crtc->dev, exynos_crtc->pipe);
|
|
drm_vblank_off(crtc->dev, exynos_crtc->pipe);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -259,6 +261,7 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc,
|
|
spin_lock_irq(&dev->event_lock);
|
|
spin_lock_irq(&dev->event_lock);
|
|
drm_vblank_put(dev, exynos_crtc->pipe);
|
|
drm_vblank_put(dev, exynos_crtc->pipe);
|
|
list_del(&event->base.link);
|
|
list_del(&event->base.link);
|
|
|
|
+ atomic_set(&exynos_crtc->pending_flip, 0);
|
|
spin_unlock_irq(&dev->event_lock);
|
|
spin_unlock_irq(&dev->event_lock);
|
|
|
|
|
|
goto out;
|
|
goto out;
|