Merge "msm: mdss: add bandwidth check while performing frame level checks" (e5a0471a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp_overlay.c

+24 −1

Original line number	Diff line number	Diff line
		@@ -2346,10 +2346,12 @@ static int __handle_overlay_prepare(struct msm_fb_data_type *mfd,
		struct mdp_overlay_list *ovlist,
		struct mdp_overlay *overlays)
		{
		struct mdss_mdp_pipe *right_plist[MDSS_MDP_MAX_STAGE] = { 0 };
		struct mdss_mdp_pipe *left_plist[MDSS_MDP_MAX_STAGE] = { 0 };
		struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);
		struct mdss_mdp_pipe *pipe;
		struct mdp_overlay *req;
		int ret = 0;
		int ret = 0, left_cnt = 0, right_cnt = 0;
		int i;
		u32 new_reqs = 0;

		@@ -2378,7 +2380,28 @@ static int __handle_overlay_prepare(struct msm_fb_data_type *mfd,
		/* keep track of the new overlays to unset in case of errors */
		if (pipe->play_cnt == 0)
		new_reqs \|= pipe->ndx;

		if (pipe->flags & MDSS_MDP_RIGHT_MIXER) {
		if (right_cnt >= MDSS_MDP_MAX_STAGE) {
		pr_err("too many pipes on right mixer\n");
		ret = -EINVAL;
		goto validate_exit;
		}
		right_plist[right_cnt] = pipe;
		right_cnt++;
		} else {
		if (left_cnt >= MDSS_MDP_MAX_STAGE) {
		pr_err("too many pipes on left mixer\n");
		ret = -EINVAL;
		goto validate_exit;
		}
		left_plist[left_cnt] = pipe;
		left_cnt++;
		}
		}

		ret = mdss_mdp_perf_bw_check(mdp5_data->ctl, left_plist, left_cnt,
		right_plist, right_cnt);

		validate_exit:
		if (IS_ERR_VALUE(ret))