diff options
| author | Dhaval Patel <pdhaval@codeaurora.org> | 2015-05-09 14:46:00 -0700 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:42:15 -0700 |
| commit | e2c6f023dd43204bb502b8c72b837d0c46ca1ca7 (patch) | |
| tree | 4fba613e10b2ec857c45b5ebcf20c2806625ad53 /drivers/clk | |
| parent | 39206c43636a9c5c1ab816eb5d54842b7f8222e7 (diff) | |
msm: clk: mdss: fix vco clk get rate API for msm8996
Incorrect get rate for n1 divider and vco rate
leads to wrong calculation of byte clock and pixel clock
during handoff for continuous splash screen. Correct
n1 divider should be read from register instead of
software because software structures are not set during
handoff. Incorrect vco calculation also provides
invalid vco rate. This change fixes both APIs to provide
correct rate for byte and pixel clock rate calculation.
Change-Id: I2b42490a58061cee429aaa777a43eaf7c384b6d9
Signed-off-by: Dhaval Patel <pdhaval@codeaurora.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c b/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c index 23520971c507..7609f76d789c 100644 --- a/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c +++ b/drivers/clk/msm/mdss/mdss-dsi-pll-8996-util.c @@ -79,12 +79,17 @@ int post_n1_div_set_div(struct div_clk *clk, int div) int post_n1_div_get_div(struct div_clk *clk) { u32 div; + int rc; struct mdss_pll_resources *pll = clk->priv; - struct dsi_pll_db *pdb; - struct dsi_pll_output *pout; - pdb = (struct dsi_pll_db *)pll->priv; - pout = &pdb->out; + if (is_gdsc_disabled(pll)) + return 0; + + rc = mdss_pll_resource_enable(pll, true); + if (rc) { + pr_err("Failed to enable mdss dsi pll resources\n"); + return rc; + } /* * postdiv = 1/2/4/8 @@ -92,10 +97,11 @@ int post_n1_div_get_div(struct div_clk *clk) * fot the time being, assume postdiv = 1 */ - div = pout->pll_postdiv * pout->pll_n1div; + div = MDSS_PLL_REG_R(pll->pll_base, DSIPHY_CMN_CLK_CFG0); + div &= 0xF; + pr_debug("n1 div = %d\n", div); - pr_debug("div=%d postdiv=%x n1div=%x\n", - div, pout->pll_postdiv, pout->pll_n1div); + mdss_pll_resource_enable(pll, false); return div; } @@ -646,7 +652,7 @@ int pll_vco_set_rate_8996(struct clk *c, unsigned long rate) unsigned long pll_vco_get_rate_8996(struct clk *c) { - u64 vco_rate, multiplier = (1 << 20); + u64 vco_rate, multiplier = BIT(20); s32 div_frac_start; u32 dec_start; struct dsi_pll_vco_clk *vco = to_vco_clk(c); @@ -676,7 +682,7 @@ unsigned long pll_vco_get_rate_8996(struct clk *c) DSIPHY_PLL_DIV_FRAC_START1) & 0x0ff; pr_debug("div_frac_start = 0x%x\n", div_frac_start); - vco_rate = ref_clk * 2 * dec_start; + vco_rate = ref_clk * dec_start; vco_rate += ((ref_clk * div_frac_start) / multiplier); pr_debug("returning vco rate = %lu\n", (unsigned long)vco_rate); |