diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-08-15 08:16:58 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-08-15 08:16:58 +0200 |
| commit | 0c697fafc66830ca7d5dc19123a1d0641deaa1f6 (patch) | |
| tree | c56336719ca8de16f78ada78e606dffa471e47d5 /include/uapi/drm | |
| parent | Merge tag 'drm-misc-next-2017-08-08' of git://anongit.freedesktop.org/git/drm... (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | linux-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.tar.xz linux-0c697fafc66830ca7d5dc19123a1d0641deaa1f6.zip | |
Backmerge tag 'v4.13-rc5' into drm-next
Linux 4.13-rc5
There's a really nasty nouveau collision, hopefully someone can take a look
once I pushed this out.
Diffstat (limited to 'include/uapi/drm')
| -rw-r--r-- | include/uapi/drm/msm_drm.h | 6 |
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) */ }; |