diff options
| author | Iliyan Malchev <malchev@google.com> | 2012-10-03 01:03:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 01:03:05 -0700 |
| commit | b988662560928d109bc0bfc6ac5fa3d805fdd45d (patch) | |
| tree | 3489c48a31d7afbae4c5eff45ad791133e90c2af /original | |
| parent | 215825801e6d77d1c6f03f110d85499c270c1d84 (diff) | |
| parent | 415c5e6381c57e51874519a457cfd14066789b1c (diff) | |
| download | kernel-headers-b988662560928d109bc0bfc6ac5fa3d805fdd45d.tar.gz | |
am 415c5e63: external/kernel-headers: update original msm_mdp.h
* commit '415c5e6381c57e51874519a457cfd14066789b1c':
external/kernel-headers: update original msm_mdp.h
Diffstat (limited to 'original')
| -rwxr-xr-x | original/linux/msm_mdp.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/original/linux/msm_mdp.h b/original/linux/msm_mdp.h index 1305fe7..11861e1 100755 --- a/original/linux/msm_mdp.h +++ b/original/linux/msm_mdp.h @@ -72,6 +72,8 @@ #define MSMFB_VSYNC_CTRL _IOW(MSMFB_IOCTL_MAGIC, 161, unsigned int) #define MSMFB_BUFFER_SYNC _IOW(MSMFB_IOCTL_MAGIC, 162, struct mdp_buf_sync) #define MSMFB_OVERLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 163, unsigned int) +#define MSMFB_DISPLAY_COMMIT _IOW(MSMFB_IOCTL_MAGIC, 164, \ + struct mdp_display_commit) #define FB_TYPE_3D_PANEL 0x10101010 #define MDP_IMGTYPE2_START 0x10000 @@ -487,7 +489,8 @@ struct msmfb_mdp_pp { } data; }; -#define MDP_MAX_FENCE_FD 4 +#define MDP_MAX_FENCE_FD 10 +#define MDP_BUF_SYNC_FLAG_WAIT 1 struct mdp_buf_sync { uint32_t flags; @@ -496,6 +499,20 @@ struct mdp_buf_sync { int *rel_fen_fd; }; +struct mdp_buf_fence { + uint32_t flags; + uint32_t acq_fen_fd_cnt; + int acq_fen_fd[MDP_MAX_FENCE_FD]; + int rel_fen_fd[MDP_MAX_FENCE_FD]; +}; + +struct mdp_display_commit { + uint32_t flags; + uint32_t wait_for_finish; + struct fb_var_screeninfo var; + struct mdp_buf_fence buf_fence; +}; + struct mdp_page_protection { uint32_t page_protection; }; |