From: Francisco Jerez Date: Tue, 28 Sep 2010 01:22:15 +0000 (+0200) Subject: drm/nv30-nv40: Fix postdivider mask when writing engine/memory PLLs. X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=23357e4da0e1b39c9dfd64a1db0deafc6d70b554;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/nv30-nv40: Fix postdivider mask when writing engine/memory PLLs. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs --- diff --git a/drivers/gpu/drm/nouveau/nouveau_hw.c b/drivers/gpu/drm/nouveau/nouveau_hw.c index ebcf8a8190c2..bed669a54a2d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hw.c +++ b/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 */