From 8a545940d020818ce0263909cc13d1245a707218 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 8 Oct 2012 19:50:46 +0000 Subject: [PATCH] --- yaml --- r: 376365 b: refs/heads/master c: 0eca56f9467038ee0b798637f03581aaa1186fac h: refs/heads/master i: 376363: 765cdf6ab09fc7958bc96b44856f04c7e6409f52 v: v3 --- [refs] | 2 +- trunk/drivers/staging/imx-drm/ipuv3-crtc.c | 21 ++------------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 9fc28c2c7db0..d79434fa1b53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7e96d7e28817a66db36e89f25b77bda7dba6da0 +refs/heads/master: 0eca56f9467038ee0b798637f03581aaa1186fac diff --git a/trunk/drivers/staging/imx-drm/ipuv3-crtc.c b/trunk/drivers/staging/imx-drm/ipuv3-crtc.c index b028b0d1317b..1cd74f5e4c76 100644 --- a/trunk/drivers/staging/imx-drm/ipuv3-crtc.c +++ b/trunk/drivers/staging/imx-drm/ipuv3-crtc.c @@ -311,31 +311,14 @@ static int ipu_crtc_mode_set(struct drm_crtc *crtc, static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc) { - struct drm_pending_vblank_event *e; - struct timeval now; unsigned long flags; struct drm_device *drm = ipu_crtc->base.dev; spin_lock_irqsave(&drm->event_lock, flags); - - e = ipu_crtc->page_flip_event; - if (!e) { - spin_unlock_irqrestore(&drm->event_lock, flags); - return; - } - - do_gettimeofday(&now); - e->event.sequence = 0; - e->event.tv_sec = now.tv_sec; - e->event.tv_usec = now.tv_usec; + if (ipu_crtc->page_flip_event) + drm_send_vblank_event(drm, -1, ipu_crtc->page_flip_event); ipu_crtc->page_flip_event = NULL; - imx_drm_crtc_vblank_put(ipu_crtc->imx_crtc); - - list_add_tail(&e->base.link, &e->base.file_priv->event_list); - - wake_up_interruptible(&e->base.file_priv->event_wait); - spin_unlock_irqrestore(&drm->event_lock, flags); }