summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Zou <b36644@freescale.com>2012-11-23 16:18:58 +0800
committerWayne Zou <b36644@freescale.com>2013-02-27 10:13:19 +0800
commit4316456edd187dcf5ff0b814c26c7bb39855bf40 (patch)
tree9b21d79c8087b94aa186fa75fe662090fe74aca6
parent2fb57cd27a9ce4facacd84687cf534fc0194dbe9 (diff)
ENGR00251836 IPU device: Support local alpha with alpha value in each pixel
Add local alpha support with alpha value in each pixel, such as RGBA pixel format. Signed-off-by: Wayne Zou <b36644@freescale.com>
-rw-r--r--drivers/mxc/ipu3/ipu_device.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mxc/ipu3/ipu_device.c b/drivers/mxc/ipu3/ipu_device.c
index 8c58ba1c3f59..b3509ba1475f 100644
--- a/drivers/mxc/ipu3/ipu_device.c
+++ b/drivers/mxc/ipu3/ipu_device.c
@@ -1900,8 +1900,9 @@ static int init_ic(struct ipu_soc *ipu, struct ipu_task_entry *t)
params.mem_prp_vf_mem.graphics_combine_en = 1;
if (t->overlay.alpha.mode == IPU_ALPHA_MODE_GLOBAL)
params.mem_prp_vf_mem.global_alpha_en = 1;
- else
+ else if (t->overlay.alpha.loc_alp_paddr)
params.mem_prp_vf_mem.alpha_chan_en = 1;
+ /* otherwise, alpha bending per pixel is used. */
params.mem_prp_vf_mem.alpha = t->overlay.alpha.gvalue;
if (t->overlay.colorkey.enable) {
params.mem_prp_vf_mem.key_color_en = 1;