From 3c6eaf2aa64f3057a60c635c1c07f8eed3615e0f Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 11 Mar 2012 21:11:22 -0500 Subject: [PATCH] --- yaml --- r: 289240 b: refs/heads/master c: 7411f9cfe67f5dd54333d2fe7e2a677c42666f99 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/omapdrm/omap_crtc.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index af006fb1d4dc..a4b68604e08c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72d0c3363e88d1816b0fef3687ff58e6553a7889 +refs/heads/master: 7411f9cfe67f5dd54333d2fe7e2a677c42666f99 diff --git a/trunk/drivers/staging/omapdrm/omap_crtc.c b/trunk/drivers/staging/omapdrm/omap_crtc.c index 13e3c7f7d2b9..490a7f15604b 100644 --- a/trunk/drivers/staging/omapdrm/omap_crtc.c +++ b/trunk/drivers/staging/omapdrm/omap_crtc.c @@ -134,9 +134,19 @@ static void vblank_cb(void *arg) /* wakeup userspace */ if (event) { + do_gettimeofday(&now); + spin_lock_irqsave(&dev->event_lock, flags); + /* TODO: we can't yet use the vblank time accounting, + * because omapdss lower layer is the one that knows + * the irq # and registers the handler, which more or + * less defeats how drm_irq works.. for now just fake + * the sequence number and use gettimeofday.. + * event->event.sequence = drm_vblank_count_and_time( dev, omap_crtc->id, &now); + */ + event->event.sequence = sequence++; event->event.tv_sec = now.tv_sec; event->event.tv_usec = now.tv_usec; list_add_tail(&event->base.link,