From fd942a967953c1a43c9b6ff50ab44106b202c7a5 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Tue, 7 Feb 2012 09:59:54 +1000
Subject: [PATCH] --- yaml --- r: 293759 b: refs/heads/master c:
 1ae73f2f16f1a905ada71e2a190d5760b4f17ed8 h: refs/heads/master i:   293757:
 1779c2ca49bd7577681c93a5f5d30f16f072b509   293755:
 dfbe6592afdbc05e82c1382fe44bb2daa0560426   293751:
 80320c20deb34c2c12e22d7778e98d6d8a6c0862   293743:
 bb034dc1390da5b4db4799644a7e303809a426f6   293727:
 98b99913fb7ef5cea4a182cd080cc57c833489ee   293695:
 1ba629eeed908fd4821ce9dcc0768eec09309135   293631:
 02d54ed3fb7fb2debbbc0d1da4af203f0bd08825 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/gpu/drm/nouveau/nvc0_pm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4c37632aab5f..804d4ac483d4 100644
--- 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
index e9992f62c1c0..ce65f81bb871 100644
--- 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