commit 3ef5f51338259341c7059f71568bbf83817f8af0
author Linux Build Service Account <lnxbuild@localhost> Thu Oct 04 18:34:09 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Oct 04 18:34:08 2012 -0700
tree 18ec622726e7e2bc4f20428837cb416d858f9405
parent 7eebc75f85d6f9dd51e55da75e2757488e7eaa02
parent a4c377fbf133bd53913d451b478c177c271ab365

Merge "msm_fb: display: remove background invert alpha option for alpha drop pipe"

drivers/video/msm/mdp4_overlay.c

diff --git a/drivers/video/msm/mdp4_overlay.c b/drivers/video/msm/mdp4_overlay.c
index 2aafa6f..8f308c3 100644
--- a/drivers/video/msm/mdp4_overlay.c
+++ b/drivers/video/msm/mdp4_overlay.c
@@ -1992,7 +1992,8 @@
 		blend->bg_alpha = 0x0ff - s_pipe->alpha;
 		blend->fg_alpha = s_pipe->alpha;
 		blend->co3_sel = 1; /* use fg alpha */
-
+		pr_debug("%s: bg alpha %d, fg alpha %d\n",
+			__func__, blend->bg_alpha, blend->fg_alpha);
 		if (s_pipe->is_fg) {
 			if (s_pipe->alpha == 0xff) {
 				blend->solidfill = 1;
@@ -2008,10 +2009,9 @@
 						MDP4_BLEND_FG_ALPHA_FG_PIXEL;
 				else
 					blend->fg_alpha = 0xff;
+				blend->op |= MDP4_BLEND_BG_INV_ALPHA;
 			} else
 				blend->op = MDP4_BLEND_BG_ALPHA_FG_CONST;
-
-			blend->op |= MDP4_BLEND_BG_INV_ALPHA;
 		} else if (d_alpha) {
 			ptype = mdp4_overlay_format2type(s_pipe->src_format);
 			if (ptype == OVERLAY_TYPE_VIDEO) {