Merge "msm: mdss: restrict decimation when layer format is macro-tile" (efab722e) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/video/msm/mdss/mdss_mdp_overlay.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -158,6 +158,9 @@ int mdss_mdp_overlay_req_check(struct msm_fb_data_type *mfd,
		} else if (req->flags & MDP_BWC_EN) {
		pr_err("Decimation can't be enabled with BWC\n");
		return -EINVAL;
		} else if (fmt->tile) {
		pr_err("Decimation can't be enabled with MacroTile format\n");
		return -EINVAL;
		}
		}

		@@ -276,7 +279,7 @@ static int __mdp_pipe_tune_perf(struct mdss_mdp_pipe *pipe)
		* mdp clock requirement
		*/
		if (mdata->has_decimation && (pipe->vert_deci < MAX_DECIMATION)
		&& !pipe->bwc_mode)
		&& !pipe->bwc_mode && !pipe->src_fmt->tile)
		pipe->vert_deci++;
		else
		return -EPERM;