---

yaml --- r: 293759 b: refs/heads/master c: 1ae73f2 h: refs/heads/master i: 293757: 1779c2c 293755: dfbe659 293751: 80320c2 293743: bb034dc 293727: 98b9991 293695: 1ba629e 293631: 02d54ed v: v3
git-mirror · Mar 13, 2012 · fd942a9 · fd942a9
1 parent 3a5ef63
commit fd942a9
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: 44ab8cc56c45ca781371a4a77f35da19cf5db028
+refs/heads/master: 1ae73f2f16f1a905ada71e2a190d5760b4f17ed8
diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_pm.c b/trunk/drivers/gpu/drm/nouveau/nvc0_pm.c
@@ -269,7 +269,7 @@ calc_clk(struct drm_device *dev, int clk, struct nvc0_pm_clock *info, u32 freq)
 	clk0 = calc_div(dev, clk, clk0, freq, &div1D);
 
 	/* see if we can get any closer using PLLs */
-	if (clk0 != freq) {
+	if (clk0 != freq && (0x00004387 & (1 << clk))) {
 		if (clk < 7)
 			clk1 = calc_pll(dev, clk, freq, &info->coef);
 		else