Merge "msm: mdss: Decimation and BWC cannot be enabled together" (609d987f) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_overlay.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -150,6 +150,9 @@ int mdss_mdp_overlay_req_check(struct msm_fb_data_type *mfd,
		pr_err("Invalid decimation factors horz=%d vert=%d\n",
		req->horz_deci, req->vert_deci);
		return -EINVAL;
		} else if (req->flags & MDP_BWC_EN) {
		pr_err("Decimation can't be enabled with BWC\n");
		return -EINVAL;
		}
		}

		@@ -266,7 +269,8 @@ static int __mdp_pipe_tune_perf(struct mdss_mdp_pipe *pipe)
		* requirement by applying vertical decimation and reduce
		* mdp clock requirement
		*/
		if (mdata->has_decimation && (pipe->vert_deci < MAX_DECIMATION))
		if (mdata->has_decimation && (pipe->vert_deci < MAX_DECIMATION)
		&& !pipe->bwc_mode)
		pipe->vert_deci++;
		else
		return -EPERM;