diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-02-28 00:45:07 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2018-02-28 00:45:07 +0000 |
| commit | 4f1066ae72f103a574895b48e67fef08530cca82 (patch) | |
| tree | 4978ef1af65a20092cd0dd3b164a767d52b6697f /lib/libdrm/include | |
| parent | 7d0f580924460c2ee620dd997e0440c8ddf42120 (diff) | |
Correct a pointless longstanding difference in ioctl numbering between
linux and add back struct members.
Avoids diffs in inteldrm, libdrm and Mesa >= 17.2.
ok kettenis@
Diffstat (limited to 'lib/libdrm/include')
| -rw-r--r-- | lib/libdrm/include/drm/i915_drm.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/lib/libdrm/include/drm/i915_drm.h b/lib/libdrm/include/drm/i915_drm.h index 01c02646a..5ebe0462f 100644 --- a/lib/libdrm/include/drm/i915_drm.h +++ b/lib/libdrm/include/drm/i915_drm.h @@ -240,19 +240,12 @@ 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 @@ -675,7 +668,6 @@ struct drm_i915_gem_relocation_entry { #define I915_GEM_DOMAIN_GTT 0x00000040 /** @} */ -#ifndef __OpenBSD__ struct drm_i915_gem_exec_object { /** * User's handle for a buffer to be bound into the GTT for this @@ -725,7 +717,6 @@ struct drm_i915_gem_execbuffer { /** This is a struct drm_clip_rect *cliprects */ __u64 cliprects_ptr; }; -#endif struct drm_i915_gem_exec_object2 { /** @@ -804,13 +795,11 @@ 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) |