diff options
| author | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
| commit | f40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951 (patch) | |
| tree | 1c515a34a60f65cbfd3cf1a387427d0a9fdf878f /drivers/gpu/drm/drm_irq.c | |
| parent | 103a196f4224dc6872081305cf7f82ebf67aa7bd (diff) | |
| parent | 46557bef3f3834ac33031c7be27d39d90d507442 (diff) | |
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'drivers/gpu/drm/drm_irq.c')
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 72754aca7abf..6b3ce6d38848 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -585,6 +585,7 @@ static int drm_queue_vblank_event(struct drm_device *dev, int pipe, | |||
| 585 | if ((vblwait->request.type & _DRM_VBLANK_NEXTONMISS) && | 585 | if ((vblwait->request.type & _DRM_VBLANK_NEXTONMISS) && |
| 586 | (seq - vblwait->request.sequence) <= (1 << 23)) { | 586 | (seq - vblwait->request.sequence) <= (1 << 23)) { |
| 587 | vblwait->request.sequence = seq + 1; | 587 | vblwait->request.sequence = seq + 1; |
| 588 | vblwait->reply.sequence = vblwait->request.sequence; | ||
| 588 | } | 589 | } |
| 589 | 590 | ||
| 590 | DRM_DEBUG("event on vblank count %d, current %d, crtc %d\n", | 591 | DRM_DEBUG("event on vblank count %d, current %d, crtc %d\n", |