diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-05-29 10:17:19 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2016-05-29 10:17:19 +0000 |
| commit | b99d2d56b00f5405be389eb9b65d3ef32fbe2812 (patch) | |
| tree | c1f20e32b6e41f3dce7f2ea65244f455a5aae73c | |
| parent | 74dc8ef7cd24a279d443ab8bf203c77d4dec5d81 (diff) | |
Import Mesa 11.2.2
| -rw-r--r-- | lib/mesa/src/gallium/winsys/virgl/drm/virtgpu_drm.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lib/mesa/src/gallium/winsys/virgl/drm/virtgpu_drm.h b/lib/mesa/src/gallium/winsys/virgl/drm/virtgpu_drm.h index b01a4cd2f..30bc3afdd 100644 --- a/lib/mesa/src/gallium/winsys/virgl/drm/virtgpu_drm.h +++ b/lib/mesa/src/gallium/winsys/virgl/drm/virtgpu_drm.h @@ -25,7 +25,7 @@ #define VIRTGPU_DRM_H #include <stddef.h> -#include "drm-uapi/drm.h" +#include "drm.h" /* Please note that modifications to all structs defined here are * subject to backwards-compatibility constraints. @@ -44,16 +44,6 @@ #define DRM_VIRTGPU_WAIT 0x08 #define DRM_VIRTGPU_GET_CAPS 0x09 -/* - * virtgpu execbuffer flags - */ -#define VIRTGPU_EXECBUF_FENCE_FD_IN 0x01 -#define VIRTGPU_EXECBUF_FENCE_FD_OUT 0x02 -#define VIRTGPU_EXECBUF_FLAGS (\ - VIRTGPU_EXECBUF_FENCE_FD_IN |\ - VIRTGPU_EXECBUF_FENCE_FD_OUT |\ - 0) - struct drm_virtgpu_map { uint64_t offset; /* use for mmap system call */ uint32_t handle; @@ -66,11 +56,10 @@ struct drm_virtgpu_execbuffer { uint64_t command; /* void* */ uint64_t bo_handles; uint32_t num_bo_handles; - int32_t fence_fd; + uint32_t pad; }; #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */ -#define VIRTGPU_PARAM_CAPSET_QUERY_FIX 2 struct drm_virtgpu_getparam { uint64_t param; @@ -140,7 +129,7 @@ struct drm_virtgpu_get_caps { DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map) #define DRM_IOCTL_VIRTGPU_EXECBUFFER \ - DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_EXECBUFFER,\ + DRM_IOW(DRM_COMMAND_BASE + DRM_VIRTGPU_EXECBUFFER,\ struct drm_virtgpu_execbuffer) #define DRM_IOCTL_VIRTGPU_GETPARAM \ |