From 1494cf09ca9c716bb6d46860472f1d6d09bcfaf3 Mon Sep 17 00:00:00 2001 From: Mythri P K Date: Tue, 21 Feb 2012 12:10:58 +0530 Subject: [PATCH] --- yaml --- r: 294339 b: refs/heads/master c: dd2116a35aa9a5a7b71e1d21f30aec8927434d19 h: refs/heads/master i: 294337: 2766eb5ef1604d04f37f33d9d6db0be3f45f2669 294335: 8af3a707eb1d7877d8634ca51010fc6ada620cc9 v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/hdmi.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f9a2485e528b..b400507de493 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ba86d7edea1f9f2d9497c31200910263e8b4128 +refs/heads/master: dd2116a35aa9a5a7b71e1d21f30aec8927434d19 diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c index a229d0f83652..c4b4f6950a92 100644 --- a/trunk/drivers/video/omap2/dss/hdmi.c +++ b/trunk/drivers/video/omap2/dss/hdmi.c @@ -278,24 +278,24 @@ static void hdmi_compute_pll(struct omap_dss_device *dssdev, int phy, refclk = clkin / pi->regn; - /* - * multiplier is pixel_clk/ref_clk - * Multiplying by 100 to avoid fractional part removal - */ - pi->regm = (phy * 100 / (refclk)) / 100; - if (dssdev->clocks.hdmi.regm2 == 0) pi->regm2 = HDMI_DEFAULT_REGM2; else pi->regm2 = dssdev->clocks.hdmi.regm2; + /* + * multiplier is pixel_clk/ref_clk + * Multiplying by 100 to avoid fractional part removal + */ + pi->regm = phy * pi->regm2 / refclk; + /* * fractional multiplier is remainder of the difference between * multiplier and actual phy(required pixel clock thus should be * multiplied by 2^18(262144) divided by the reference clock */ - mf = (phy - pi->regm * refclk) * 262144; - pi->regmf = mf / (refclk); + mf = (phy - pi->regm / pi->regm2 * refclk) * 262144; + pi->regmf = pi->regm2 * mf / refclk; /* * Dcofreq should be set to 1 if required pixel clock