summaryrefslogtreecommitdiffstats
path: root/include/uapi
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-08-15 11:54:13 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-08-15 11:54:13 -0400
commit55cfcd12115419810972f62741df19ca98c575a3 (patch)
treeeb9b6e6666c2791e7af030f3f4bf47fcce615454 /include/uapi
parent35bdb0979555e2fca39a5b0302d1b0c4b17d81e6 (diff)
parent75e8c48b9ef30bfda38e7f6e5d807352fbf0b090 (diff)
downloadcachepc-linux-55cfcd12115419810972f62741df19ca98c575a3.tar.gz
cachepc-linux-55cfcd12115419810972f62741df19ca98c575a3.zip
Merge branch 'open_state'
Diffstat (limited to 'include/uapi')
-rw-r--r--include/uapi/drm/msm_drm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/drm/msm_drm.h b/include/uapi/drm/msm_drm.h
index 26c54f6d595d..ad4eb2863e70 100644
--- a/include/uapi/drm/msm_drm.h
+++ b/include/uapi/drm/msm_drm.h
@@ -171,7 +171,7 @@ struct drm_msm_gem_submit_cmd {
__u32 size; /* in, cmdstream size */
__u32 pad;
__u32 nr_relocs; /* in, number of submit_reloc's */
- __u64 __user relocs; /* in, ptr to array of submit_reloc's */
+ __u64 relocs; /* in, ptr to array of submit_reloc's */
};
/* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -215,8 +215,8 @@ struct drm_msm_gem_submit {
__u32 fence; /* out */
__u32 nr_bos; /* in, number of submit_bo's */
__u32 nr_cmds; /* in, number of submit_cmd's */
- __u64 __user bos; /* in, ptr to array of submit_bo's */
- __u64 __user cmds; /* in, ptr to array of submit_cmd's */
+ __u64 bos; /* in, ptr to array of submit_bo's */
+ __u64 cmds; /* in, ptr to array of submit_cmd's */
__s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
};