summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajesh Sastrula <vrajesh@codeaurora.org>2010-09-29 11:14:30 -0700
committerRajesh Sastrula <vrajesh@codeaurora.org>2010-09-29 11:17:51 -0700
commit788dd46e7bb5382aefbe82adac305037043c1318 (patch)
tree2d90f407f34e0fff0e2025598275c18c4647ed6b
parent4c86cbfbb95188ca480b801f9385898f4cabcf37 (diff)
downloadbionic-788dd46e7bb5382aefbe82adac305037043c1318.zip
bionic-788dd46e7bb5382aefbe82adac305037043c1318.tar.gz
bionic-788dd46e7bb5382aefbe82adac305037043c1318.tar.bz2
bionic: update msm_mdp.h with the latest one at kernel
Change-Id: I5a19d8d15dd5afacd3a1243fb6054851da35ed52
-rw-r--r--libc/kernel/common/linux/msm_mdp.h45
1 files changed, 38 insertions, 7 deletions
diff --git a/libc/kernel/common/linux/msm_mdp.h b/libc/kernel/common/linux/msm_mdp.h
index 82acdd5..2afc7ff 100644
--- a/libc/kernel/common/linux/msm_mdp.h
+++ b/libc/kernel/common/linux/msm_mdp.h
@@ -29,13 +29,14 @@
#define MSMFB_OVERLAY_SET _IOWR(MSMFB_IOCTL_MAGIC, 135, struct mdp_overlay)
#define MSMFB_OVERLAY_UNSET _IOW(MSMFB_IOCTL_MAGIC, 136, unsigned int)
#define MSMFB_OVERLAY_PLAY _IOW(MSMFB_IOCTL_MAGIC, 137, struct msmfb_overlay_data)
-#define MSMFB_GET_PAGE_PROTECTION _IOR(MSMFB_IOCTL_MAGIC, 138, \
- struct mdp_page_protection)
-#define MSMFB_SET_PAGE_PROTECTION _IOW(MSMFB_IOCTL_MAGIC, 139, \
- struct mdp_page_protection)
+#define MSMFB_GET_PAGE_PROTECTION _IOR(MSMFB_IOCTL_MAGIC, 138, struct mdp_page_protection)
+#define MSMFB_SET_PAGE_PROTECTION _IOW(MSMFB_IOCTL_MAGIC, 139, struct mdp_page_protection)
#define MSMFB_OVERLAY_GET _IOR(MSMFB_IOCTL_MAGIC, 140, struct mdp_overlay)
-
#define MSMFB_OVERLAY_PLAY_ENABLE _IOW(MSMFB_IOCTL_MAGIC, 141, unsigned int)
+#define MSMFB_OVERLAY_BLT _IOWR(MSMFB_IOCTL_MAGIC, 142, struct msmfb_overlay_blt)
+#define MSMFB_OVERLAY_BLT_OFFSET _IOW(MSMFB_IOCTL_MAGIC, 143, unsigned int)
+#define MSMFB_HISTOGRAM_START _IO(MSMFB_IOCTL_MAGIC, 144)
+#define MSMFB_HISTOGRAM_STOP _IO(MSMFB_IOCTL_MAGIC, 145)
#define MDP_IMGTYPE2_START 0x10000
@@ -73,13 +74,30 @@ enum {
#define MDP_ROT_270 (MDP_ROT_90|MDP_FLIP_UD|MDP_FLIP_LR)
#define MDP_DITHER 0x8
#define MDP_BLUR 0x10
-
+#define MDP_BLEND_FG_PREMULT 0x20000
#define MDP_DEINTERLACE 0x80000000
#define MDP_SHARPENING 0x40000000
-
+#define MDP_NO_DMA_BARRIER_START 0x20000000
+#define MDP_NO_DMA_BARRIER_END 0x10000000
+#define MDP_NO_BLIT 0x08000000
+#define MDP_BLIT_WITH_DMA_BARRIERS 0x000
+#define MDP_BLIT_WITH_NO_DMA_BARRIERS (MDP_NO_DMA_BARRIER_START | MDP_NO_DMA_BARRIER_END)
+#define MDP_BLIT_SRC_GEM 0x04000000
+#define MDP_BLIT_DST_GEM 0x02000000
+#define MDP_BLIT_NON_CACHED 0x01000000
#define MDP_TRANSP_NOP 0xffffffff
#define MDP_ALPHA_NOP 0xff
+#define MDP_FB_PAGE_PROTECTION_NONCACHED (0)
+#define MDP_FB_PAGE_PROTECTION_WRITECOMBINE (1)
+#define MDP_FB_PAGE_PROTECTION_WRITETHROUGHCACHE (2)
+#define MDP_FB_PAGE_PROTECTION_WRITEBACKCACHE (3)
+#define MDP_FB_PAGE_PROTECTION_WRITEBACKWACACHE (4)
+
+#define MDP_FB_PAGE_PROTECTION_INVALID (5)
+
+#define MDP_NUM_FB_PAGE_PROTECTION_VALUES (5)
+
struct mdp_rect {
uint32_t x;
uint32_t y;
@@ -108,6 +126,8 @@ struct mdp_ccs {
uint16_t bv[MDP_BV_SIZE];
};
+#define MDP_BLIT_REQ_VERSION 2
+
struct mdp_blit_req {
struct mdp_img src;
struct mdp_img dst;
@@ -124,6 +144,8 @@ struct mdp_blit_req_list {
struct mdp_blit_req req[];
};
+#define MSMFB_DATA_VERSION 2
+
struct msmfb_data {
uint32_t offset;
int memory_id;
@@ -158,6 +180,11 @@ struct mdp_overlay {
uint32_t user_data[8];
};
+struct msmfb_overlay_blt {
+ uint32_t enable;
+ struct msmfb_data data;
+};
+
struct mdp_histogram {
uint32_t frame_cnt;
uint32_t bin_cnt;
@@ -166,4 +193,8 @@ struct mdp_histogram {
uint32_t *b;
};
+struct mdp_page_protection {
+ uint32_t page_protection;
+};
+
#endif