diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-14 23:45:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-14 23:45:36 -0700 |
| commit | 3d973006bc4c684162b6e7d440d2bfbaefc79ead (patch) | |
| tree | 09fb1ea7abb2f88cb4ce1e986badaa56f8efac63 /include/uapi | |
| parent | ba76a5fa05e9ba0f029a2c6fd9c57b77251db5dc (diff) | |
| parent | a8cbfeb8b0cab0091572d2cb3ff9b11b37b5a260 (diff) | |
Merge "drm/msm: Move QTI specific ioctls to avoid conflict"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/drm/msm_drm.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h index d2f19ac6f536..8ef93938155c 100644 --- a/include/uapi/drm/msm_drm.h +++ b/include/uapi/drm/msm_drm.h @@ -263,10 +263,11 @@ struct drm_msm_event_resp { #define DRM_MSM_GEM_CPU_FINI 0x05 #define DRM_MSM_GEM_SUBMIT 0x06 #define DRM_MSM_WAIT_FENCE 0x07 -#define DRM_SDE_WB_CONFIG 0x08 -#define DRM_MSM_REGISTER_EVENT 0x09 -#define DRM_MSM_DEREGISTER_EVENT 0x0A -#define DRM_MSM_NUM_IOCTLS 0x0B + +#define DRM_SDE_WB_CONFIG 0x40 +#define DRM_MSM_REGISTER_EVENT 0x41 +#define DRM_MSM_DEREGISTER_EVENT 0x42 +#define DRM_MSM_NUM_IOCTLS 0x43 /** * Currently DRM framework supports only VSYNC event. |