From 036bf27a24ca4bdd248adb1c79f9df86a1a9486e Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Fri, 2 Nov 2012 13:30:47 +0200 Subject: [PATCH] --- yaml --- r: 345517 b: refs/heads/master c: 85473328bac6170aabb5e13d2542d11d1fc4cc76 h: refs/heads/master i: 345515: 394d42f09e74980468465bcd4803a9ac5bfd62f2 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_crtc.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index eccc96872636..94daeacd2c44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdd66e06ce71cdcdb515ef355d4f2fc90e151503 +refs/heads/master: 85473328bac6170aabb5e13d2542d11d1fc4cc76 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_crtc.c index fce245f64c4f..2efa4b031d73 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -236,16 +236,21 @@ static int exynos_drm_crtc_page_flip(struct drm_crtc *crtc, goto out; } + spin_lock_irq(&dev->event_lock); list_add_tail(&event->base.link, &dev_priv->pageflip_event_list); + spin_unlock_irq(&dev->event_lock); crtc->fb = fb; ret = exynos_drm_crtc_mode_set_base(crtc, crtc->x, crtc->y, NULL); if (ret) { crtc->fb = old_fb; + + spin_lock_irq(&dev->event_lock); drm_vblank_put(dev, exynos_crtc->pipe); list_del(&event->base.link); + spin_unlock_irq(&dev->event_lock); goto out; }