diff options
Diffstat (limited to 'include/drm')
-rw-r--r-- | include/drm/i915_drm.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h index 725a8dec..4931107c 100644 --- a/include/drm/i915_drm.h +++ b/include/drm/i915_drm.h | |||
@@ -192,6 +192,7 @@ typedef struct _drm_i915_sarea { | |||
192 | #define DRM_I915_GEM_EXECBUFFER2 0x29 | 192 | #define DRM_I915_GEM_EXECBUFFER2 0x29 |
193 | #define DRM_I915_GET_SPRITE_COLORKEY 0x2a | 193 | #define DRM_I915_GET_SPRITE_COLORKEY 0x2a |
194 | #define DRM_I915_SET_SPRITE_COLORKEY 0x2b | 194 | #define DRM_I915_SET_SPRITE_COLORKEY 0x2b |
195 | #define DRM_I915_GEM_WAIT 0x2c | ||
195 | 196 | ||
196 | #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) | 197 | #define DRM_IOCTL_I915_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_I915_INIT, drm_i915_init_t) |
197 | #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) | 198 | #define DRM_IOCTL_I915_FLUSH DRM_IO ( DRM_COMMAND_BASE + DRM_I915_FLUSH) |
@@ -235,6 +236,7 @@ typedef struct _drm_i915_sarea { | |||
235 | #define DRM_IOCTL_I915_OVERLAY_ATTRS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs) | 236 | #define DRM_IOCTL_I915_OVERLAY_ATTRS DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_OVERLAY_ATTRS, struct drm_intel_overlay_attrs) |
236 | #define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) | 237 | #define DRM_IOCTL_I915_SET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) |
237 | #define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) | 238 | #define DRM_IOCTL_I915_GET_SPRITE_COLORKEY DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_SET_SPRITE_COLORKEY, struct drm_intel_sprite_colorkey) |
239 | #define DRM_IOCTL_I915_GEM_WAIT DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_WAIT, struct drm_i915_gem_wait) | ||
238 | 240 | ||
239 | /* Allow drivers to submit batchbuffers directly to hardware, relying | 241 | /* Allow drivers to submit batchbuffers directly to hardware, relying |
240 | * on the security mechanisms provided by hardware. | 242 | * on the security mechanisms provided by hardware. |
@@ -290,6 +292,7 @@ typedef struct drm_i915_irq_wait { | |||
290 | #define I915_PARAM_HAS_GEN7_SOL_RESET 16 | 292 | #define I915_PARAM_HAS_GEN7_SOL_RESET 16 |
291 | #define I915_PARAM_HAS_LLC 17 | 293 | #define I915_PARAM_HAS_LLC 17 |
292 | #define I915_PARAM_HAS_ALIASING_PPGTT 18 | 294 | #define I915_PARAM_HAS_ALIASING_PPGTT 18 |
295 | #define I915_PARAM_HAS_WAIT_TIMEOUT 19 | ||
293 | 296 | ||
294 | typedef struct drm_i915_getparam { | 297 | typedef struct drm_i915_getparam { |
295 | int param; | 298 | int param; |
@@ -878,4 +881,12 @@ struct drm_intel_sprite_colorkey { | |||
878 | __u32 flags; | 881 | __u32 flags; |
879 | }; | 882 | }; |
880 | 883 | ||
884 | struct drm_i915_gem_wait { | ||
885 | /** Handle of BO we shall wait on */ | ||
886 | __u32 bo_handle; | ||
887 | __u32 flags; | ||
888 | /** Number of nanoseconds to wait, Returns time remaining. */ | ||
889 | __s64 timeout_ns; | ||
890 | }; | ||
891 | |||
881 | #endif /* _I915_DRM_H_ */ | 892 | #endif /* _I915_DRM_H_ */ |