From 90cc9d9838d37c975c6a225ffd4392bf11497dc4 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 28 Sep 2010 03:22:15 +0200 Subject: [PATCH] --- yaml --- r: 218237 b: refs/heads/master c: 23357e4da0e1b39c9dfd64a1db0deafc6d70b554 h: refs/heads/master i: 218235: 5339b97c05663846f292468d5c0e542615e469bd v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c94d7fff3b45..f681158d876b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2756a4f5df42bf19496ad7759032633ab826ea0e +refs/heads/master: 23357e4da0e1b39c9dfd64a1db0deafc6d70b554 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_hw.c b/trunk/drivers/gpu/drm/nouveau/nouveau_hw.c index ebcf8a8190c2..bed669a54a2d 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_hw.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_hw.c @@ -305,7 +305,7 @@ setPLL_double_lowregs(struct drm_device *dev, uint32_t NMNMreg, bool mpll = Preg == 0x4020; uint32_t oldPval = nvReadMC(dev, Preg); uint32_t NMNM = pv->NM2 << 16 | pv->NM1; - uint32_t Pval = (oldPval & (mpll ? ~(0x11 << 16) : ~(1 << 16))) | + uint32_t Pval = (oldPval & (mpll ? ~(0x77 << 16) : ~(7 << 16))) | 0xc << 28 | pv->log2P << 16; uint32_t saved4600 = 0; /* some cards have different maskc040s */