aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-05-24 18:03:10 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-05-25 08:15:46 -0400
commit23ba4fd0a42a46551041e379712e808ad496ba45 (patch)
tree53804484779f44977f60310ab8dec52c9289459e /drivers/gpu/drm/i915/i915_drv.h
parentf3fd37683cc406ffaccf097de0433130c85c8651 (diff)
drm/i915: wait render timeout ioctl
This helps implement GL_ARB_sync but stops short of allowing full blown sync objects. Finally we can use the new timed seqno waiting function to allow userspace to wait on a buffer object with a timeout. This implements that interface. The IOCTL will take as input a buffer object handle, and a timeout in nanoseconds (flags is currently optional but will likely be used for permutations of flush operations). Users may specify 0 nanoseconds to instantly check. The wait ioctl with a timeout of 0 reimplements the busy ioctl. With any non-zero timeout parameter the wait ioctl will wait for the given number of nanoseconds on an object becoming unbusy. Since the wait itself does so holding struct_mutex the object may become re-busied before this completes. A similar but shorter race condition exists in the busy ioctl. v2: ETIME/ERESTARTSYS instead of changing to EBUSY, and EGAIN (Chris) Flush the object from the gpu write domain (Chris + Daniel) Fix leaked refcount in good case (Chris) Naturally align ioctl struct (Chris) v3: Drop lock after getting seqno to avoid ugly dance (Chris) v4: check for 0 timeout after olr check to allow polling (Chris) v5: Updated the comment. (Chris) v6: Return -ETIME instead of -EBUSY when timeout_ns is 0 (Daniel) Fix the commit message comment to be less ugly (Ben) Add a warning to check the return timespec (Ben) v7: Use DRM_AUTH for the ioctl. (Eugeni) Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 11c7a6a330c1..8ac10e8c0cdb 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1229,6 +1229,8 @@ int i915_gem_get_tiling(struct drm_device *dev, void *data,
1229 struct drm_file *file_priv); 1229 struct drm_file *file_priv);
1230int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data, 1230int i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
1231 struct drm_file *file_priv); 1231 struct drm_file *file_priv);
1232int i915_gem_wait_ioctl(struct drm_device *dev, void *data,
1233 struct drm_file *file_priv);
1232void i915_gem_load(struct drm_device *dev); 1234void i915_gem_load(struct drm_device *dev);
1233int i915_gem_init_object(struct drm_gem_object *obj); 1235int i915_gem_init_object(struct drm_gem_object *obj);
1234int __must_check i915_gem_flush_ring(struct intel_ring_buffer *ring, 1236int __must_check i915_gem_flush_ring(struct intel_ring_buffer *ring,