commit 85a8272d788722979ab88747804b120fae91e075
author Jayant Shekhar <jshekhar@codeaurora.org> Thu Jan 28 11:22:47 2016 +0530
committer Jayant Shekhar <jshekhar@codeaurora.org> Fri Jan 29 16:52:09 2016 +0530
tree b45f1377d3c04c7ed1dedabc1860affe12b7154d
parent 6f0b6326147980cbd6717ab42b7acce48211324c

platform: msm_shared: Update MDP5 for msmgold support

This change updates MDP5 with the new MDSS_MDP version checks.

CRs-Fixed: 968289
Change-Id: Ic759e03472eb9e5c2558fdd021cf7f5969fc47ee

platform/msm_shared/mdp5.c

diff --git a/platform/msm_shared/mdp5.c b/platform/msm_shared/mdp5.c
index 89f7961..1bcb69f 100755
--- a/platform/msm_shared/mdp5.c
+++ b/platform/msm_shared/mdp5.c
@@ -62,7 +62,8 @@
 	return (MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
 		MDSS_MDP_HW_REV_107) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
 		MDSS_MDP_HW_REV_114) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
-		MDSS_MDP_HW_REV_116));
+		MDSS_MDP_HW_REV_116) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
+		MDSS_MDP_HW_REV_115));
 }
 
 static inline bool has_fixed_size_smp()
@@ -70,7 +71,8 @@
 	return (MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
 		MDSS_MDP_HW_REV_107) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
 		MDSS_MDP_HW_REV_114) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
-		MDSS_MDP_HW_REV_116));
+		MDSS_MDP_HW_REV_116) || MDSS_IS_MAJOR_MINOR_MATCHING(readl(MDP_HW_REV),
+		MDSS_MDP_HW_REV_115));
 }
 
 uint32_t mdss_mdp_intf_offset()
@@ -83,7 +85,8 @@
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_111) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_112) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_114) ||
-		(mdss_mdp_rev == MDSS_MDP_HW_REV_116))
+		(mdss_mdp_rev == MDSS_MDP_HW_REV_116) ||
+		(mdss_mdp_rev == MDSS_MDP_HW_REV_115))
 		mdss_mdp_intf_off = 0x59100;
 	else if (mdss_mdp_rev >= MDSS_MDP_HW_REV_102)
 		mdss_mdp_intf_off = 0;
@@ -119,6 +122,7 @@
 	if ((mdss_mdp_rev == MDSS_MDP_HW_REV_110) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_111) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_114) ||
+		(mdss_mdp_rev == MDSS_MDP_HW_REV_115) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_116))
 		return 0xB0020;
 	else if (MDSS_IS_MAJOR_MINOR_MATCHING(mdss_mdp_rev, MDSS_MDP_HW_REV_107))
@@ -218,6 +222,7 @@
 			MDSS_MDP_HW_REV_107) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_114) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_116) ||
+		(mdss_mdp_rev == MDSS_MDP_HW_REV_115) ||
 		(mdss_mdp_rev == MDSS_MDP_HW_REV_110)) {
 		if (pinfo->dest == DISPLAY_2) {
 			*ctl0_reg_val |= BIT(29);