diff options
| author | Lukasz Kalamarz <lukasz.kalamarz@intel.com> | 2018-11-29 13:57:25 +0100 |
|---|---|---|
| committer | Katarzyna Dec <katarzyna.dec@intel.com> | 2018-12-04 13:50:23 +0100 |
| commit | 6a965853560b2f8070d639b61506506842f87ff5 (patch) | |
| tree | 8b19dbe21598fcbf060f9baecd619962a73e9c39 /include/drm-uapi/virtgpu_drm.h | |
| parent | 14c1b132c8f829637c55fb071a9a2e5ce00e7ed8 (diff) | |
include/drm-uapi: bump headers
Taken from drm-next :
commit 1ec28f8b8ada4e4f77d1af006a3a474f4f83b8e3
Merge: 61647c77cb15 2e6e902d1850
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Nov 29 10:34:03 2018 +1000
Merge v4.20-rc4 into drm-next
Generated by 'make headers_install'
Signed-off-by: Lukasz Kalamarz <lukasz.kalamarz@intel.com>
Diffstat (limited to 'include/drm-uapi/virtgpu_drm.h')
| -rw-r--r-- | include/drm-uapi/virtgpu_drm.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/include/drm-uapi/virtgpu_drm.h b/include/drm-uapi/virtgpu_drm.h index 91a31ffe..f06a789f 100644 --- a/include/drm-uapi/virtgpu_drm.h +++ b/include/drm-uapi/virtgpu_drm.h @@ -47,6 +47,13 @@ extern "C" { #define DRM_VIRTGPU_WAIT 0x08 #define DRM_VIRTGPU_GET_CAPS 0x09 +#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 { __u64 offset; /* use for mmap system call */ __u32 handle; @@ -54,15 +61,16 @@ struct drm_virtgpu_map { }; struct drm_virtgpu_execbuffer { - __u32 flags; /* for future use */ + __u32 flags; __u32 size; __u64 command; /* void* */ __u64 bo_handles; __u32 num_bo_handles; - __u32 pad; + __s32 fence_fd; /* in/out fence fd (see VIRTGPU_EXECBUF_FENCE_FD_IN/OUT) */ }; #define VIRTGPU_PARAM_3D_FEATURES 1 /* do we have 3D features in the hw */ +#define VIRTGPU_PARAM_CAPSET_QUERY_FIX 2 /* do we have the capset fix */ struct drm_virtgpu_getparam { __u64 param; @@ -136,7 +144,7 @@ struct drm_virtgpu_get_caps { DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_MAP, struct drm_virtgpu_map) #define DRM_IOCTL_VIRTGPU_EXECBUFFER \ - DRM_IOW(DRM_COMMAND_BASE + DRM_VIRTGPU_EXECBUFFER,\ + DRM_IOWR(DRM_COMMAND_BASE + DRM_VIRTGPU_EXECBUFFER,\ struct drm_virtgpu_execbuffer) #define DRM_IOCTL_VIRTGPU_GETPARAM \ |