drm/nva3/pm: allow use of divisor 16
authorBen Skeggs <bskeggs@redhat.com>
Wed, 20 Apr 2011 04:15:49 +0000 (14:15 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 16 May 2011 00:50:52 +0000 (10:50 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nva3_pm.c

index 5285b9813700979baa6d18cdc7c52d6464a0d54f..bc357c850dbd03e43001e1915a7a065fcad277f4 100644 (file)
@@ -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)