summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Ying <b17645@freescale.com>2009-12-18 09:46:23 -0500
committerLiu Ying <b17645@freescale.com>2009-12-18 11:33:27 -0500
commit729aec86b479f47d43976ebf8900369c75681112 (patch)
tree9518261dd6e3ec93c44d0498315473eca6b53643
parent387e7cc338c8b5fbdb4b1cb155239b3e336ad84a (diff)
ENGR00119070 IPUv3 FB:Support DP local alpha in pixel
Modify MXCFB_SET_LOC_ALPHA ioctrl to support DP local alpha with alpha value contained in pixel. Signed-off-by: Liu Ying <b17645@freescale.com>
-rw-r--r--drivers/video/mxc/mxc_ipuv3_fb.c2
-rw-r--r--include/linux/mxcfb.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/mxc/mxc_ipuv3_fb.c b/drivers/video/mxc/mxc_ipuv3_fb.c
index 39c9fdd207af..3aa04a7e5159 100644
--- a/drivers/video/mxc/mxc_ipuv3_fb.c
+++ b/drivers/video/mxc/mxc_ipuv3_fb.c
@@ -739,7 +739,7 @@ static int mxcfb_ioctl(struct fb_info *fbi, unsigned int cmd, unsigned long arg)
break;
}
- if (la.enable) {
+ if (la.enable && !la.alpha_in_pixel) {
mxc_fbi->alpha_chan_en = true;
if (mxc_fbi->ipu_ch == MEM_FG_SYNC)
diff --git a/include/linux/mxcfb.h b/include/linux/mxcfb.h
index f7d60a3377d3..f0ea365753a9 100644
--- a/include/linux/mxcfb.h
+++ b/include/linux/mxcfb.h
@@ -37,6 +37,7 @@ struct mxcfb_gbl_alpha {
struct mxcfb_loc_alpha {
int enable;
+ int alpha_in_pixel;
unsigned long alpha_phy_addr0;
unsigned long alpha_phy_addr1;
};