evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/nva3: fix overflow in fixed point math used for pll calculation

Browse source 
And a slight tweak which gets us closer to VBIOS-calculated numbers.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2010-10-01 14:39:37 +10:00
parent 699ddfd980
commit 2a56a0b913
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/gpu/drm/nouveau/nv50_calc.c
View file

@ -51,24 +51,28 @@ nv50_calc_pll2(struct drm_device *dev, struct pll_lims *pll, int clk,
int *N, int *fN, int *M, int *P) int *N, int *fN, int *M, int *P)
{ {
fixed20_12 fb_div, a, b; fixed20_12 fb_div, a, b;
u32 refclk = pll->refclk / 10;
u32 max_vco_freq = pll->vco1.maxfreq / 10;
u32 max_vco_inputfreq = pll->vco1.max_inputfreq / 10;
clk /= 10;
*P = pll->vco1.maxfreq / clk; *P = max_vco_freq / clk;
if (*P > pll->max_p) if (*P > pll->max_p)
*P = pll->max_p; *P = pll->max_p;
if (*P < pll->min_p) if (*P < pll->min_p)
*P = pll->min_p; *P = pll->min_p;
/* *M = ceil(refclk / pll->vco.max_inputfreq); */ /* *M = floor((refclk + max_vco_inputfreq) / max_vco_inputfreq); */
a.full = dfixed_const(pll->refclk); a.full = dfixed_const(refclk + max_vco_inputfreq);
b.full = dfixed_const(pll->vco1.max_inputfreq); b.full = dfixed_const(max_vco_inputfreq);
a.full = dfixed_div(a, b); a.full = dfixed_div(a, b);
a.full = dfixed_ceil(a); a.full = dfixed_floor(a);
*M = dfixed_trunc(a); *M = dfixed_trunc(a);
/* fb_div = (vco * *M) / refclk; */ /* fb_div = (vco * *M) / refclk; */
fb_div.full = dfixed_const(clk * *P); fb_div.full = dfixed_const(clk * *P);
fb_div.full = dfixed_mul(fb_div, a); fb_div.full = dfixed_mul(fb_div, a);
a.full = dfixed_const(pll->refclk); a.full = dfixed_const(refclk);
fb_div.full = dfixed_div(fb_div, a); fb_div.full = dfixed_div(fb_div, a);
/* *N = floor(fb_div); */ /* *N = floor(fb_div); */