commit e4629b963615847ada94eda6c349d322bb080b1f
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 26 00:29:51 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 26 00:29:51 2013 -0700
tree da24bfb43f868332ad70684527deac969d73b030
parent 88f8f707ba1ed26479363106137b9f428cc65d67
parent a652a40af220e0a49002c2e5229b2e33e0912ef2

Merge "msm: mdss: Do not unstage pipe when kickoff is issued without buffer"

drivers/video/msm/mdss/mdss_mdp_overlay.c

diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
index 4032b91..99b0205 100644
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
@@ -838,9 +838,7 @@
 		} else if (pipe->front_buf.num_planes) {
 			buf = &pipe->front_buf;
 		} else {
-			pr_warn("pipe queue w/o buffer. unstaging layer\n");
-			pipe->params_changed = 0;
-			mdss_mdp_mixer_pipe_unstage(pipe);
+			pr_warn("pipe queue w/o buffer\n");
 			continue;
 		}