commit 0e8a9eb0f04e149fb13f444382cfcd5db5bb36ba
author Linux Build Service Account <lnxbuild@localhost> Wed Apr 24 18:06:28 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Apr 24 18:06:27 2013 -0700
tree 1423dd9c2d3f80e60f6f178d287f044b58d9461e
parent 6e8c4d6c7c0e255d105b644de8c4a4e3c527b8aa
parent 54ddb2b73b2f9594115865837eb766b37cca119d

Merge "msm: mdss: update backlight on every frame"

drivers/video/msm/mdss/mdss_fb.c

diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
index eb4eee2..a7ea948 100644
--- a/drivers/video/msm/mdss/mdss_fb.c
+++ b/drivers/video/msm/mdss/mdss_fb.c
@@ -1210,6 +1210,7 @@
 		mdss_fb_wait_for_fence(mfd);
 		if (mfd->mdp.kickoff_fnc)
 			mfd->mdp.kickoff_fnc(mfd);
+		mdss_fb_update_backlight(mfd);
 		mdss_fb_signal_timeline(mfd);
 	} else {
 		var = &fb_backup->disp_commit.var;

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 024b73f..763ef61 100644
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
@@ -1775,11 +1775,8 @@
 			struct msmfb_overlay_data data;
 
 			ret = copy_from_user(&data, argp, sizeof(data));
-			if (!ret) {
+			if (!ret)
 				ret = mdss_mdp_overlay_play(mfd, &data);
-				if (!IS_ERR_VALUE(ret))
-					mdss_fb_update_backlight(mfd);
-			}
 
 			if (ret)
 				pr_debug("OVERLAY_PLAY failed (%d)\n", ret);