diff options
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/i915_dma.c | 1 | ||||
| -rw-r--r-- | shared-core/i915_drm.h | 9 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 2 | 
3 files changed, 12 insertions, 0 deletions
| diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c index 1fc617d1..76cd45f1 100644 --- a/shared-core/i915_dma.c +++ b/shared-core/i915_dma.c @@ -1180,6 +1180,7 @@ struct drm_ioctl_desc i915_ioctls[] = {  	DRM_IOCTL_DEF(DRM_I915_GEM_EXECBUFFER, i915_gem_execbuffer, DRM_AUTH),  	DRM_IOCTL_DEF(DRM_I915_GEM_PIN, i915_gem_pin_ioctl, DRM_AUTH|DRM_ROOT_ONLY),  	DRM_IOCTL_DEF(DRM_I915_GEM_UNPIN, i915_gem_unpin_ioctl, DRM_AUTH|DRM_ROOT_ONLY), +	DRM_IOCTL_DEF(DRM_I915_GEM_BUSY, i915_gem_busy_ioctl, DRM_AUTH),  };  int i915_max_ioctl = DRM_ARRAY_SIZE(i915_ioctls); diff --git a/shared-core/i915_drm.h b/shared-core/i915_drm.h index b50471f3..a8e09e72 100644 --- a/shared-core/i915_drm.h +++ b/shared-core/i915_drm.h @@ -180,6 +180,7 @@ typedef struct drm_i915_sarea {  #define DRM_I915_GEM_EXECBUFFER	0x14  #define DRM_I915_GEM_PIN	0x15  #define DRM_I915_GEM_UNPIN	0x16 +#define DRM_I915_GEM_BUSY	0x17  #define DRM_IOCTL_I915_INIT		DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t)  #define DRM_IOCTL_I915_FLUSH		DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) @@ -203,6 +204,7 @@ typedef struct drm_i915_sarea {  #define DRM_IOCTL_I915_GEM_EXECBUFFER	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_EXECBUFFER, struct drm_i915_gem_execbuffer)  #define DRM_IOCTL_I915_GEM_PIN		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_PIN, struct drm_i915_gem_pin)  #define DRM_IOCTL_I915_GEM_UNPIN	DRM_IOW(DRM_COMMAND_BASE + DRM_I915_GEM_UNPIN, struct drm_i915_gem_unpin) +#define DRM_IOCTL_I915_GEM_BUSY		DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_BUSY, struct drm_i915_gem_busy)  /* Asynchronous page flipping:   */ @@ -536,5 +538,12 @@ struct drm_i915_gem_unpin {  	uint32_t pad;  }; +struct drm_i915_gem_busy { +	/** Handle of the buffer to check for busy */ +	uint32_t handle; +	 +	/** Return busy status (1 if busy, 0 if idle) */ +	uint32_t busy; +};  #endif				/* _I915_DRM_H_ */ diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index e217b789..04e149a9 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -449,6 +449,8 @@ int i915_gem_pin_ioctl(struct drm_device *dev, void *data,  		       struct drm_file *file_priv);  int i915_gem_unpin_ioctl(struct drm_device *dev, void *data,  			 struct drm_file *file_priv); +int i915_gem_busy_ioctl(struct drm_device *dev, void *data, +			struct drm_file *file_priv);  int i915_gem_init_object(struct drm_gem_object *obj);  void i915_gem_free_object(struct drm_gem_object *obj);  int i915_gem_set_domain(struct drm_gem_object *obj, | 
