commit b6e8bfc9d56fbdf1595e9d358e8ba87a31b8c79f
author Linux Build Service Account <lnxbuild@localhost> Fri Oct 10 06:25:12 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Oct 10 06:25:11 2014 -0700
tree ce8e4d878576c2a77a7532bd467578c58c27e6cb
parent 8ec087fa71eb3243079945b847c67e295893173a
parent e099cd3e0884b7a2930c1710beb5111eee49e1f4

Merge "msm: mdss: Disable the PP features if partial update feature is enabled"

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 437ebe4..f286de5 100644
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
@@ -2271,6 +2271,11 @@
 	u32 copyback = 0;
 	u32 copy_from_kernel = 0;
 
+	if (mfd->panel_info->partial_update_enabled) {
+		pr_err("Partical update feature is enabled.");
+		return -EPERM;
+	}
+
 	ret = copy_from_user(&mdp_pp, argp, sizeof(mdp_pp));
 	if (ret)
 		return ret;
@@ -2384,6 +2389,11 @@
 	u32 pp_bus_handle;
 	static int req = -1;
 
+	if (mfd->panel_info->partial_update_enabled) {
+		pr_err("Partical update feature is enabled.");
+		return -EPERM;
+	}
+
 	switch (cmd) {
 	case MSMFB_HISTOGRAM_START:
 		if (!mfd->panel_power_on)