History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 9 years ago

Commit 463910e2 parents 22cb7a3 510c8a8228 files · +2154 −904Browse files

Showing the changes to include/uapi (1 of 228 files). Show all

Unified · Split

include/uapi/drm/msm_drm.h+3−3
@@ -171,7 +171,7 @@ struct drm_msm_gem_submit_cmd { · 170 unmodified lines
171 __u32 size; /* in, cmdstream size */171 __u32 size; /* in, cmdstream size */
172 __u32 pad;172 __u32 pad;
173 __u32 nr_relocs; /* in, number of submit_reloc's */173 __u32 nr_relocs; /* in, number of submit_reloc's */
174 __u64 __user relocs; /* in, ptr to array of submit_reloc's */174 __u64 relocs; /* in, ptr to array of submit_reloc's */
175};175};
176 176
177/* Each buffer referenced elsewhere in the cmdstream submit (ie. the177/* Each buffer referenced elsewhere in the cmdstream submit (ie. the
@@ -215,8 +215,8 @@ struct drm_msm_gem_submit { · 37 unmodified lines
215 __u32 fence; /* out */215 __u32 fence; /* out */
216 __u32 nr_bos; /* in, number of submit_bo's */216 __u32 nr_bos; /* in, number of submit_bo's */
217 __u32 nr_cmds; /* in, number of submit_cmd's */217 __u32 nr_cmds; /* in, number of submit_cmd's */
218 __u64 __user bos; /* in, ptr to array of submit_bo's */218 __u64 bos; /* in, ptr to array of submit_bo's */
219 __u64 __user cmds; /* in, ptr to array of submit_cmd's */219 __u64 cmds; /* in, ptr to array of submit_cmd's */
220 __s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */220 __s32 fence_fd; /* in/out fence fd (see MSM_SUBMIT_FENCE_FD_IN/OUT) */
221};221};
222 222

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t