diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-12-31 07:12:27 +0000 |
| commit | 051645c92924bf915d82bf219f2ed67309b5577a (patch) | |
| tree | 4aae126dd8e5a18c6a9926a5468d1561e6038a07 /lib/mesa/include/drm-uapi | |
| parent | 2dae6fe6f74cf7fb9fd65285302c0331d9786b00 (diff) | |
Merge Mesa 17.2.8
Diffstat (limited to 'lib/mesa/include/drm-uapi')
| -rw-r--r-- | lib/mesa/include/drm-uapi/i915_drm.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/mesa/include/drm-uapi/i915_drm.h b/lib/mesa/include/drm-uapi/i915_drm.h index c26bf7c12..891b25b5e 100644 --- a/lib/mesa/include/drm-uapi/i915_drm.h +++ b/lib/mesa/include/drm-uapi/i915_drm.h @@ -240,12 +240,19 @@ typedef struct _drm_i915_sarea { #define DRM_I915_GEM_SET_TILING 0x21 #define DRM_I915_GEM_GET_TILING 0x22 #define DRM_I915_GEM_GET_APERTURE 0x23 +#ifdef __OpenBSD__ +#define DRM_I915_GEM_EXECBUFFER2 0x24 +#define DRM_I915_GEM_MADVISE 0x25 +#define DRM_I915_GEM_MMAP_GTT 0x26 +#define DRM_I915_GET_PIPE_FROM_CRTC_ID 0x29 +#else #define DRM_I915_GEM_MMAP_GTT 0x24 #define DRM_I915_GET_PIPE_FROM_CRTC_ID 0x25 #define DRM_I915_GEM_MADVISE 0x26 +#define DRM_I915_GEM_EXECBUFFER2 0x29 +#endif #define DRM_I915_OVERLAY_PUT_IMAGE 0x27 #define DRM_I915_OVERLAY_ATTRS 0x28 -#define DRM_I915_GEM_EXECBUFFER2 0x29 #define DRM_I915_GEM_EXECBUFFER2_WR DRM_I915_GEM_EXECBUFFER2 #define DRM_I915_GET_SPRITE_COLORKEY 0x2a #define DRM_I915_SET_SPRITE_COLORKEY 0x2b @@ -689,6 +696,7 @@ struct drm_i915_gem_relocation_entry { #define I915_GEM_DOMAIN_WC 0x00000080 /** @} */ +#ifndef __OpenBSD__ struct drm_i915_gem_exec_object { /** * User's handle for a buffer to be bound into the GTT for this @@ -738,6 +746,7 @@ struct drm_i915_gem_execbuffer { /** This is a struct drm_clip_rect *cliprects */ __u64 cliprects_ptr; }; +#endif struct drm_i915_gem_exec_object2 { /** @@ -823,11 +832,13 @@ struct drm_i915_gem_execbuffer2 { __u32 batch_start_offset; /** Bytes used in batchbuffer from batch_start_offset */ __u32 batch_len; +#ifndef __OpenBSD__ __u32 DR1; __u32 DR4; __u32 num_cliprects; /** This is a struct drm_clip_rect *cliprects */ __u64 cliprects_ptr; +#endif #define I915_EXEC_RING_MASK (7<<0) #define I915_EXEC_DEFAULT (0<<0) #define I915_EXEC_RENDER (1<<0) |