From cc303e3fe4a84f718a8092a62bdcfa61e4a7ddd0 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Fri, 12 Oct 2012 15:21:44 +0300 Subject: [PATCH] --- yaml --- r: 344611 b: refs/heads/master c: b7f1fe541b01f6edaff0a5dd48027de6ac711ab6 h: refs/heads/master i: 344609: 518685b35217d40482744ed058f29f0d3c8560fc 344607: 8b5cb89ef19e665a66f5706e94522b686f649d0b v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/dsi.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c0f1ec3eed86..52a27e090d78 100644 --- 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 index 2ba505b33153..ea5c6603a51d 100644 --- 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 */