commit 119a1ceacb05b42d77b5157971526f6574cd4997
author Jordan Crouse <jcrouse@codeaurora.org> Tue Mar 07 11:14:03 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 27 10:23:31 2017 -0700
tree b08ef0484a57ccde71e68e9668b099b70bbbfd3b
parent 9ba4378c5b9b95c26b87a57535b2eaf900afc2b1

drm/msm: Move QTI specific ioctls to avoid conflict

To avoid conflicting with upstream changes when upgrading the kernel
version, move QTI specific ioctls to start at command number 0x40.
This provides plenty of space for the upstream ioctl list to grown
before there are conflicts.

Change-Id: Ic0dedbadad9d3a24467f3d5992104754e31cd769
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>

include/uapi/drm/msm_drm.h

diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index c104244..7823f6f 100644
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h
@@ -279,8 +279,11 @@
 #define DRM_MSM_GEM_SUBMIT             0x06
 #define DRM_MSM_WAIT_FENCE             0x07
 #define DRM_MSM_GEM_MADVISE            0x08
-#define DRM_SDE_WB_CONFIG              0x08
-#define DRM_MSM_NUM_IOCTLS             0x09
+
+#define DRM_SDE_WB_CONFIG              0x40
+#define DRM_MSM_REGISTER_EVENT         0x41
+#define DRM_MSM_DEREGISTER_EVENT       0x42
+#define DRM_MSM_NUM_IOCTLS             0x43
 
 #define DRM_IOCTL_MSM_GET_PARAM        DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GET_PARAM, struct drm_msm_param)
 #define DRM_IOCTL_MSM_GEM_NEW          DRM_IOWR(DRM_COMMAND_BASE + DRM_MSM_GEM_NEW, struct drm_msm_gem_new)