commit 0b7d66243d80e4d75e886e6018624da4004f7302
author Iliyan Malchev <malchev@google.com> Mon Sep 24 08:49:04 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 24 08:49:04 2012 -0700
tree 1a75fa5ebb90fb377c0544903e2ceca7712a9806
parent 849d4bcd79f0bc683927f4516bb28151afbb9098
parent d94b29f400140cb1d5a2eea8a5fd8d10a32c5b57

am d94b29f4: am ddbcadff: update original msm_mdp.h kernel header

* commit 'd94b29f400140cb1d5a2eea8a5fd8d10a32c5b57':
  update original msm_mdp.h kernel header

original/linux/msm_mdp.h

diff --git a/original/linux/msm_mdp.h b/original/linux/msm_mdp.h
index 2519a6e..cca6185 100755
--- a/original/linux/msm_mdp.h
+++ b/original/linux/msm_mdp.h
@@ -70,6 +70,7 @@
 #define MSMFB_MDP_PP _IOWR(MSMFB_IOCTL_MAGIC, 156, struct msmfb_mdp_pp)
 #define MSMFB_OVERLAY_VSYNC_CTRL _IOW(MSMFB_IOCTL_MAGIC, 160, unsigned int)
 #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 FB_TYPE_3D_PANEL 0x10101010
 #define MDP_IMGTYPE2_START 0x10000
 #define MSMFB_DRIVER_VERSION	0xF9E8D701
@@ -484,6 +485,14 @@
 	} data;
 };
 
+#define MDP_MAX_FENCE_FD	4
+
+struct mdp_buf_sync {
+	uint32_t flags;
+	uint32_t acq_fen_fd_cnt;
+	int *acq_fen_fd;
+	int *rel_fen_fd;
+};
 
 struct mdp_page_protection {
 	uint32_t page_protection;