From: Ben Skeggs Date: Wed, 20 Apr 2011 04:15:49 +0000 (+1000) Subject: drm/nva3/pm: allow use of divisor 16 X-Git-Tag: v3.0-rc3~42^2~48^2~3 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bfb61f43b37158d432a1897bc2a4bbbd41215fae;p=~emulex%2Finfiniband.git drm/nva3/pm: allow use of divisor 16 Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c index 5285b981370..bc357c850db 100644 --- a/drivers/gpu/drm/nouveau/nva3_pm.c +++ b/drivers/gpu/drm/nouveau/nva3_pm.c @@ -128,7 +128,7 @@ nva3_pm_clock_pre(struct drm_device *dev, struct nouveau_pm_level *perflvl, /* If target clock is within [-2, 3) MHz of a divisor, we'll * use that instead of calculating MNP values */ - pll->new_div = ((limits.refclk * 2) / (khz - 2999)) & 0x0f; + pll->new_div = min((limits.refclk * 2) / (khz - 2999), 16); if (pll->new_div) { diff = khz - ((limits.refclk * 2) / pll->new_div); if (diff < -2000 || diff >= 3000)