Merge "msm: mdss: Fix mixer config for 8084 RGB3 & ViG3 pipes" (4836bef8) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_ctl.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -1317,7 +1317,13 @@ static int mdss_mdp_mixer_setup(struct mdss_mdp_ctl *ctl,
		if (!pipe->src_fmt->alpha_enable && bg_alpha_enable)
		blend_color_out = 0;

		if (pipe->num == MDSS_MDP_SSPP_VIG3 \|\|
		pipe->num == MDSS_MDP_SSPP_RGB3) {
		/* Add 2 to account for Cursor & Border bits */
		mixercfg \|= stage << ((3 * pipe->num)+2);
		} else {
		mixercfg \|= stage << (3 * pipe->num);
		}

		pr_debug("stg=%d op=%x fg_alpha=%x bg_alpha=%x\n", stage,
		blend_op, fg_alpha, bg_alpha);