diff options
| author | Sean Callanan <spyffe@google.com> | 2019-11-21 17:06:09 -0800 |
|---|---|---|
| committer | Sean Callanan <spyffe@google.com> | 2019-11-21 17:12:41 -0800 |
| commit | 22cff94dff64bbc4f47285de725968779c61fd24 (patch) | |
| tree | 1ac56b2ec142d70a02db2d7d2de486865d737931 | |
| parent | 2a34a0418e367b5b3948f0b62a29922ee6a76f78 (diff) | |
| download | platform_external_igt-gpu-tools-22cff94dff64bbc4f47285de725968779c61fd24.tar.gz platform_external_igt-gpu-tools-22cff94dff64bbc4f47285de725968779c61fd24.tar.bz2 platform_external_igt-gpu-tools-22cff94dff64bbc4f47285de725968779c61fd24.zip | |
igt-gpu-tools: import updated uapi for MSM
The version of the MSM DRM UAPI in igt-gpu-tools was out of date.
Updating to a more recent version from libdrm.
Bug: 142890405
Test: built gem_blt successfully
Change-Id: I72c2292cf9d45f8c0515fdba7a0259bdb289fd7c
| -rw-r--r-- | include/drm-uapi/msm_drm.h | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/include/drm-uapi/msm_drm.h b/include/drm-uapi/msm_drm.h index 91a16b33..c06d0a5b 100644 --- a/include/drm-uapi/msm_drm.h +++ b/include/drm-uapi/msm_drm.h @@ -105,24 +105,14 @@ struct drm_msm_gem_new { __u32 handle; /* out */ }; -/* Get or set GEM buffer info. The requested value can be passed - * directly in 'value', or for data larger than 64b 'value' is a - * pointer to userspace buffer, with 'len' specifying the number of - * bytes copied into that buffer. For info returned by pointer, - * calling the GEM_INFO ioctl with null 'value' will return the - * required buffer size in 'len' - */ -#define MSM_INFO_GET_OFFSET 0x00 /* get mmap() offset, returned by value */ -#define MSM_INFO_GET_IOVA 0x01 /* get iova, returned by value */ -#define MSM_INFO_SET_NAME 0x02 /* set the debug name (by pointer) */ -#define MSM_INFO_GET_NAME 0x03 /* get debug name, returned by pointer */ +#define MSM_INFO_IOVA 0x01 + +#define MSM_INFO_FLAGS (MSM_INFO_IOVA) struct drm_msm_gem_info { __u32 handle; /* in */ - __u32 info; /* in - one of MSM_INFO_* */ - __u64 value; /* in or out */ - __u32 len; /* in or out */ - __u32 pad; + __u32 flags; /* in - combination of MSM_INFO_* flags */ + __u64 offset; /* out, mmap() offset or iova */ }; #define MSM_PREP_READ 0x01 @@ -198,11 +188,8 @@ struct drm_msm_gem_submit_cmd { */ #define MSM_SUBMIT_BO_READ 0x0001 #define MSM_SUBMIT_BO_WRITE 0x0002 -#define MSM_SUBMIT_BO_DUMP 0x0004 -#define MSM_SUBMIT_BO_FLAGS (MSM_SUBMIT_BO_READ | \ - MSM_SUBMIT_BO_WRITE | \ - MSM_SUBMIT_BO_DUMP) +#define MSM_SUBMIT_BO_FLAGS (MSM_SUBMIT_BO_READ | MSM_SUBMIT_BO_WRITE) struct drm_msm_gem_submit_bo { __u32 flags; /* in, mask of MSM_SUBMIT_BO_x */ |