aboutsummaryrefslogtreecommitdiff
path: root/original
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2012-10-02 23:35:26 -0700
committerIliyan Malchev <malchev@google.com>2012-10-03 00:54:43 -0700
commit415c5e6381c57e51874519a457cfd14066789b1c (patch)
treeabf0f87df2dd6784094e82b448a3e6b7a5fc61a9 /original
parent41f851b350e30397f7f41cddbfa8e6f73544ca49 (diff)
downloadkernel-headers-415c5e6381c57e51874519a457cfd14066789b1c.tar.gz
external/kernel-headers: update original msm_mdp.handroid-sdk-support_r11
Bug: 7274951 Change-Id: I6af07d244213299842d2f668ccc8ef8e857bb137 Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'original')
-rwxr-xr-xoriginal/linux/msm_mdp.h19
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;
};