commit 5131c4e02c4d52ca9f4a5c411a1513b07ade93e8
author Linux Build Service Account <lnxbuild@localhost> Sun Jun 30 10:27:14 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jun 30 10:27:14 2013 -0700
tree 1bf6ae9f21afb2846d7ecc6586dd3fa85569fad0
parent db94d4113a2f6612e4fbb140415096c1b1daa883
parent aab585168027325b00d8a90491dbdafc0a9c527e

Merge "msm_shared: mdp: Fix MDP version check to support display"

platform/msm_shared/mdp5.c

diff --git a/platform/msm_shared/mdp5.c b/platform/msm_shared/mdp5.c
index 690c955..e86c8df 100644
--- a/platform/msm_shared/mdp5.c
+++ b/platform/msm_shared/mdp5.c
@@ -59,13 +59,10 @@
 	uint32_t mdss_mdp_intf_off;
 	uint32_t mdss_mdp_rev = readl(MDP_HW_REV);
 
-	if (mdss_mdp_rev ==  MDSS_MDP_HW_REV_100
-		|| mdss_mdp_rev ==  MDSS_MDP_HW_REV_102)
+	if (mdss_mdp_rev >= MDSS_MDP_HW_REV_102)
 		mdss_mdp_intf_off = 0;
-	else if (mdss_mdp_rev ==  MDSS_MDP_HW_REV_101)
-		mdss_mdp_intf_off = 0xEC00;
 	else
-		mdss_mdp_intf_off = 0;
+		mdss_mdp_intf_off = 0xEC00;
 
 	return mdss_mdp_intf_off;
 }
@@ -131,7 +128,7 @@
 		writel(0x1, VBIF_VBIF_DDR_FORCE_CLK_ON);
 
 		if (mdp_hw_rev == MDSS_MDP_HW_REV_100
-			|| mdp_hw_rev == MDSS_MDP_HW_REV_102) {
+			|| mdp_hw_rev >= MDSS_MDP_HW_REV_102) {
 			/* Configure DDR burst length */
 			writel(0x00000707, VBIF_VBIF_DDR_OUT_MAX_BURST);
 			writel(0x00000030, VBIF_VBIF_DDR_ARB_CTRL );
@@ -140,7 +137,7 @@
 			writel(0x0FFF0FFF, VBIF_VBIF_DDR_OUT_AX_AOOO);
 			writel(0x22222222, VBIF_VBIF_DDR_AXI_AMEMTYPE_CONF0);
 			writel(0x00002222, VBIF_VBIF_DDR_AXI_AMEMTYPE_CONF1);
-		} else if (mdp_hw_rev == MDSS_MDP_HW_REV_101) {
+		} else if (mdp_hw_rev >= MDSS_MDP_HW_REV_101) {
 			writel(0x00000707, VBIF_VBIF_DDR_OUT_MAX_BURST);
 			writel(0x00000003, VBIF_VBIF_DDR_ARB_CTRL);
 		}
@@ -158,12 +155,11 @@
 	xres = pinfo->xres;
 	bpp = pinfo->bpp;
 
-	if (mdss_mdp_rev == MDSS_MDP_HW_REV_101) {
-		rgb0_client_id = MMSS_MDP_1_1_CLIENT_ID_RGB0;
-	} else if (mdss_mdp_rev == MDSS_MDP_HW_REV_100
-		|| mdss_mdp_rev == MDSS_MDP_HW_REV_102) {
+	if (mdss_mdp_rev == MDSS_MDP_HW_REV_100
+		|| mdss_mdp_rev >= MDSS_MDP_HW_REV_102)
 		rgb0_client_id = MMSS_MDP_1_2_CLIENT_ID_RGB0;
-	}
+	else if (mdss_mdp_rev >= MDSS_MDP_HW_REV_101)
+		rgb0_client_id = MMSS_MDP_1_1_CLIENT_ID_RGB0;
 
 	if (pinfo->lcdc.dual_pipe) {
 		/* Each pipe driving half the screen */