---

yaml --- r: 344611 b: refs/heads/master c: b7f1fe5 h: refs/heads/master i: 344609: 518685b 344607: 8b5cb89 v: v3
git-mirror · Nov 5, 2012 · cc303e3 · cc303e3
1 parent 5cfd0e9
commit cc303e3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 046bc5751d70c9d5356d725e3e16987ed98eb7c8
+refs/heads/master: b7f1fe541b01f6edaff0a5dd48027de6ac711ab6
diff --git a/trunk/drivers/video/omap2/dss/dsi.c b/trunk/drivers/video/omap2/dss/dsi.c
@@ -1386,6 +1386,11 @@ int dsi_pll_calc_clock_div_pck(struct platform_device *dsidev,
 				cur.dsi_pll_hsdiv_dispc_clk =
 					cur.clkin4ddr / cur.regm_dispc;
 
+				if (cur.regm_dispc > 1 &&
+						cur.regm_dispc % 2 != 0 &&
+						req_pck >= 1000000)
+					continue;
+
 				/* this will narrow down the search a bit,
 				 * but still give pixclocks below what was
 				 * requested */