summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_overlay.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_overlay.c b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
index 5a30cfe6b549..5eb8d44903cc 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_overlay.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_overlay.c
@@ -357,9 +357,22 @@ static int __mdp_pipe_tune_perf(struct mdss_mdp_pipe *pipe)
for (;;) {
rc = mdss_mdp_perf_calc_pipe(pipe, &perf, NULL, true);
- if (!rc && (perf.mdp_clk_rate <= mdata->max_mdp_clk_rate) &&
- !mdss_mdp_perf_bw_check_pipe(&perf, pipe))
- break;
+ if (!rc && (perf.mdp_clk_rate <= mdata->max_mdp_clk_rate)) {
+ rc = mdss_mdp_perf_bw_check_pipe(&perf, pipe);
+ if (!rc) {
+ break;
+ } else if ((rc == -E2BIG) && !pipe->vert_deci) {
+ /*
+ * if per pipe BW exceeds the limit and user
+ * has not requested decimation then return
+ * -E2BIG error back to user else try more
+ * decimation.
+ */
+ pr_debug("pipe%d exceeded per pipe BW\n",
+ pipe->num);
+ return rc;
+ }
+ }
/*
* if decimation is available try to reduce minimum clock rate