aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-02-06 18:59:54 -0500
committerBen Skeggs <bskeggs@redhat.com>2012-03-13 03:14:58 -0400
commit1ae73f2f16f1a905ada71e2a190d5760b4f17ed8 (patch)
tree10ee30114c0333feed5b80bffb571d9b935c70d0 /drivers/gpu/drm
parent44ab8cc56c45ca781371a4a77f35da19cf5db028 (diff)
drm/nvc0/pm: restrict pll mode to clocks that can actually use it
Fixes reclocking failure on some chips where we attempted to set PDAEMON to PLL mode. Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_pm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_pm.c b/drivers/gpu/drm/nouveau/nvc0_pm.c
index e9992f62c1c0..ce65f81bb871 100644
--- a/drivers/gpu/drm/nouveau/nvc0_pm.c
+++ b/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)
269 clk0 = calc_div(dev, clk, clk0, freq, &div1D); 269 clk0 = calc_div(dev, clk, clk0, freq, &div1D);
270 270
271 /* see if we can get any closer using PLLs */ 271 /* see if we can get any closer using PLLs */
272 if (clk0 != freq) { 272 if (clk0 != freq && (0x00004387 & (1 << clk))) {
273 if (clk < 7) 273 if (clk < 7)
274 clk1 = calc_pll(dev, clk, freq, &info->coef); 274 clk1 = calc_pll(dev, clk, freq, &info->coef);
275 else 275 else