summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 00531ce)
raw | patch | inline | side by side (parent: 00531ce)
author | Michel Dänzer <michel@tungstengraphics.com> | |
Wed, 30 Aug 2006 17:33:28 +0000 (19:33 +0200) | ||
committer | Michel Dänzer <michel@tungstengraphics.com> | |
Fri, 29 Sep 2006 10:55:08 +0000 (12:55 +0200) |
Handle relative as well as absolute target sequence numbers.
Return error if target sequence has already passed, so userspace can deal with
this situation as it sees fit.
On success, return the sequence number of the vertical blank when the buffer
swap is expected to take place.
Also add DRM_IOCTL_I915_VBLANK_SWAP definition for userspace code that may want
to use ioctl() instead of drmCommandWriteRead().
(cherry picked from d5a0f107511e128658e2d5e15bd7e6215c507f29 commit)
Return error if target sequence has already passed, so userspace can deal with
this situation as it sees fit.
On success, return the sequence number of the vertical blank when the buffer
swap is expected to take place.
Also add DRM_IOCTL_I915_VBLANK_SWAP definition for userspace code that may want
to use ioctl() instead of drmCommandWriteRead().
(cherry picked from d5a0f107511e128658e2d5e15bd7e6215c507f29 commit)
shared-core/i915_drm.h | patch | blob | history | |
shared-core/i915_irq.c | patch | blob | history |
diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h
index e1db7a6524dfc751c68cc46534b02e705e37ea7f..e2a70231f769a96f820ddeb1c331eeccec592ddb 100644 (file)
--- a/shared-core/i915_drm.h
+++ b/shared-core/i915_drm.h
#define DRM_IOCTL_I915_DESTROY_HEAP DRM_IOW( DRM_COMMAND_BASE + DRM_I915_DESTROY_HEAP, drm_i915_mem_destroy_heap_t)
#define DRM_IOCTL_I915_SET_VBLANK_PIPE DRM_IOW( DRM_COMMAND_BASE + DRM_I915_SET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
#define DRM_IOCTL_I915_GET_VBLANK_PIPE DRM_IOR( DRM_COMMAND_BASE + DRM_I915_GET_VBLANK_PIPE, drm_i915_vblank_pipe_t)
+#define DRM_IOCTL_I915_VBLANK_SWAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_VBLANK_SWAP, drm_i915_vblank_swap_t)
/* Allow drivers to submit batchbuffers directly to hardware, relying
*/
typedef struct drm_i915_vblank_swap {
drm_drawable_t drawable;
- unsigned int pipe;
+ drm_vblank_seq_type_t seqtype;
unsigned int sequence;
} drm_i915_vblank_swap_t;
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 667a9ca8fc4a407abadd0771543eceee8833bffc..3c562fdd3435b2b1b99e376c5f0a4fb3d7f2c94e 100644 (file)
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
drm_i915_private_t *dev_priv = dev->dev_private;
drm_i915_vblank_swap_t swap;
drm_i915_vbl_swap_t *vbl_swap;
- unsigned int irqflags;
+ unsigned int pipe, seqtype, irqflags, curseq;
struct list_head *list;
if (!dev_priv) {
DRM_COPY_FROM_USER_IOCTL(swap, (drm_i915_vblank_swap_t __user *) data,
sizeof(swap));
- if (swap.pipe > 1 || !(dev_priv->vblank_pipe & (1 << swap.pipe))) {
- DRM_ERROR("Invalid pipe %d\n", swap.pipe);
+ if (swap.seqtype & ~(_DRM_VBLANK_RELATIVE | _DRM_VBLANK_ABSOLUTE |
+ _DRM_VBLANK_SECONDARY)) {
+ DRM_ERROR("Invalid sequence type 0x%x\n", swap.seqtype);
+ return DRM_ERR(EINVAL);
+ }
+
+ pipe = (swap.seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0;
+
+ 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);
}
spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+ curseq = atomic_read(pipe ? &dev->vbl_received2 : &dev->vbl_received);
+
spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
+ switch (seqtype) {
+ case _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);
+ DRM_DEBUG("Missed target sequence\n");
+ return DRM_ERR(EINVAL);
+ }
+ break;
+ }
+
list_for_each(list, &dev_priv->vbl_swaps.head) {
vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);
if (vbl_swap->drw_id == swap.drawable &&
- vbl_swap->pipe == swap.pipe &&
+ vbl_swap->pipe == pipe &&
vbl_swap->sequence == swap.sequence) {
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
DRM_DEBUG("Already scheduled\n");
DRM_DEBUG("\n");
vbl_swap->drw_id = swap.drawable;
- vbl_swap->pipe = swap.pipe;
+ vbl_swap->pipe = pipe;
vbl_swap->sequence = swap.sequence;
spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+ DRM_COPY_TO_USER_IOCTL((drm_i915_vblank_swap_t __user *) data, swap,
+ sizeof(swap));
+
return 0;
}