summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/i915_irq.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index d32f592f..9db38706 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -399,7 +399,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
sizeof(swap));
if (swap.seqtype & ~(_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE |
- _DRM_VBLANK_SECONDARY)) {
+ _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS)) {
DRM_ERROR("Invalid sequence type 0x%x\n", swap.seqtype);
return DRM_ERR(EINVAL);
}
@@ -408,11 +408,6 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
seqtype = swap.seqtype & (_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE);
- if (seqtype == _DRM_VBLANK_RELATIVE && swap.sequence == 0) {
- DRM_DEBUG("Not scheduling swap for current sequence\n");
- return DRM_ERR(EINVAL);
- }
-
if (!(dev_priv->vblank_pipe & (1 << pipe))) {
DRM_ERROR("Invalid pipe %d\n", pipe);
return DRM_ERR(EINVAL);
@@ -430,21 +425,20 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
curseq = atomic_read(pipe ? &dev->vbl_received2 : &dev->vbl_received);
- spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
-
- switch (seqtype) {
- case _DRM_VBLANK_RELATIVE:
+ if (seqtype == _DRM_VBLANK_RELATIVE)
swap.sequence += curseq;
- break;
- case _DRM_VBLANK_ABSOLUTE:
- if ((curseq - swap.sequence) <= (1<<23)) {
- spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+
+ if ((curseq - swap.sequence) <= (1<<23)) {
+ if (swap.seqtype & _DRM_VBLANK_NEXTONMISS) {
+ swap.sequence = curseq + 1;
+ } else {
DRM_DEBUG("Missed target sequence\n");
return DRM_ERR(EINVAL);
}
- break;
}
+ spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
+
list_for_each(list, &dev_priv->vbl_swaps.head) {
vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);