---

yaml --- r: 250686 b: refs/heads/master c: bfb61f4 h: refs/heads/master v: v3
git-mirror · May 16, 2011 · 1b73fdb · 1b73fdb
1 parent 48e9fd5
commit 1b73fdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 047d2df54cb866f13014cb566eac61449bf89a29
+refs/heads/master: bfb61f43b37158d432a1897bc2a4bbbd41215fae
diff --git a/trunk/drivers/gpu/drm/nouveau/nva3_pm.c b/trunk/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)