diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-05-24 10:12:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-05-24 10:12:22 +1000 |
| commit | c313d56754fee4eaed849f85a14044144bdd79c4 (patch) | |
| tree | 17b562070406b6d56347ab86ae748203d6d8cfe1 /drivers/gpu/drm/nouveau | |
| parent | b91fd4d5aad0c1124654341814067ca3f59490fc (diff) | |
| parent | 0eca56f9467038ee0b798637f03581aaa1186fac (diff) | |
Merge remote-tracking branch 'pfdo/drm-fixes' into drm-next
Pull the vblank event changes into a Linus master tree to make merging
easier.
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_display.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c index 7bf22d4a3d96..f17dc2ab03ec 100644 --- a/drivers/gpu/drm/nouveau/nouveau_display.c +++ b/drivers/gpu/drm/nouveau/nouveau_display.c @@ -638,17 +638,8 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, } s = list_first_entry(&fctx->flip, struct nouveau_page_flip_state, head); - if (s->event) { - struct drm_pending_vblank_event *e = s->event; - struct timeval now; - - do_gettimeofday(&now); - e->event.sequence = 0; - e->event.tv_sec = now.tv_sec; - e->event.tv_usec = now.tv_usec; - list_add_tail(&e->base.link, &e->base.file_priv->event_list); - wake_up_interruptible(&e->base.file_priv->event_wait); - } + if (s->event) + drm_send_vblank_event(dev, -1, s->event); list_del(&s->head); if (ps) |