commit e19a2869b3db914e93335746ef80878103d5c0cd
author Carl Vanderlip <carlv@codeaurora.org> Thu Oct 27 11:26:24 2011 -0700
committer Carl Vanderlip <carlv@codeaurora.org> Mon Oct 31 13:20:00 2011 -0700
tree ecd1b8d676a572b1c584b188534bdfe2f467db49
parent 13f48ed4a9141772385eb44bd8c1923668ae32df

video: msm: Remove redundant code in histogram collection

Rewrites start and stop histogram functions to better use the existing
mdp_histogram_ctrl function.

CRs-Fixed: 310429
Change-Id: Iecc97c1376319021f99dd00eee6fb154bf7a5740
Signed-off-by: Carl Vanderlip <carlv@codeaurora.org>

drivers/video/msm/mdp.c

diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index cc4cd21..3b6c864 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -242,35 +242,29 @@
 {
 	unsigned long flag;
 	unsigned long hist_base;
-	boolean hist_start;
 
 	if (mdp_rev >= MDP_REV_40)
 		hist_base = 0x95000;
 	else
 		hist_base = 0x94000;
 
-	spin_lock_irqsave(&mdp_spin_lock, flag);
-	hist_start = mdp_is_hist_start;
-	spin_unlock_irqrestore(&mdp_spin_lock, flag);
-
-	if (hist_start == TRUE) {
-		if (en == TRUE) {
-			mdp_enable_irq(MDP_HISTOGRAM_TERM);
-			mdp_hist_frame_cnt = 1;
-			mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
-			if (mdp_rev >= MDP_REV_40) {
-				MDP_OUTP(MDP_BASE + hist_base + 0x10, 1);
-				MDP_OUTP(MDP_BASE + hist_base + 0x1c,
-								INTR_HIST_DONE);
-			}
-			MDP_OUTP(MDP_BASE + hist_base + 0x4,
-							mdp_hist_frame_cnt);
-			MDP_OUTP(MDP_BASE + hist_base, 1);
-			mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF,
-					FALSE);
-		} else
-			mdp_disable_irq(MDP_HISTOGRAM_TERM);
+	if (en == TRUE) {
+		mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
+		mdp_hist_frame_cnt = 1;
+		mdp_enable_irq(MDP_HISTOGRAM_TERM);
+		spin_lock_irqsave(&mdp_spin_lock, flag);
+		if (mdp_is_hist_start == FALSE && mdp_rev >= MDP_REV_40) {
+			MDP_OUTP(MDP_BASE + hist_base + 0x10, 1);
+			MDP_OUTP(MDP_BASE + hist_base + 0x1c, INTR_HIST_DONE);
+		}
+		spin_unlock_irqrestore(&mdp_spin_lock, flag);
+		MDP_OUTP(MDP_BASE + hist_base + 0x4, mdp_hist_frame_cnt);
+		MDP_OUTP(MDP_BASE + hist_base, 1);
+		mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
+	} else {
+		mdp_disable_irq(MDP_HISTOGRAM_TERM);
 	}
+
 	return 0;
 }
 
@@ -286,26 +280,18 @@
 		goto mdp_hist_start_err;
 	}
 
+	ret = mdp_histogram_ctrl(TRUE);
+
 	spin_lock_irqsave(&mdp_spin_lock, flag);
 	mdp_is_hist_start = TRUE;
 	spin_unlock_irqrestore(&mdp_spin_lock, flag);
-	mdp_enable_irq(MDP_HISTOGRAM_TERM);
-	mdp_hist_frame_cnt = 1;
-	mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_ON, FALSE);
-#ifdef CONFIG_FB_MSM_MDP40
-	MDP_OUTP(MDP_BASE + 0x95004, 1);
-	MDP_OUTP(MDP_BASE + 0x95000, 1);
-#else
-	MDP_OUTP(MDP_BASE + 0x94004, 1);
-	MDP_OUTP(MDP_BASE + 0x94000, 1);
-#endif
-	mdp_pipe_ctrl(MDP_CMD_BLOCK, MDP_BLOCK_POWER_OFF, FALSE);
 
 mdp_hist_start_err:
 	mutex_unlock(&mdp_hist_mutex);
 	return ret;
 
 }
+
 int mdp_stop_histogram(struct fb_info *info)
 {
 	unsigned long flag;
@@ -316,12 +302,12 @@
 		ret = -EPERM;
 		goto mdp_hist_stop_err;
 	}
+
 	spin_lock_irqsave(&mdp_spin_lock, flag);
 	mdp_is_hist_start = FALSE;
 	spin_unlock_irqrestore(&mdp_spin_lock, flag);
-	/* disable the irq for histogram since we handled it
-	   when the control reaches here */
-	mdp_disable_irq(MDP_HISTOGRAM_TERM);
+
+	ret = mdp_histogram_ctrl(FALSE);
 
 mdp_hist_stop_err:
 	mutex_unlock(&mdp_hist_mutex);