Commit 6805979f authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nv50/pm: 0x84/0x86 can't use "1" for nvclk src, need 0x50 method 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 06784090

drivers/gpu/drm/nouveau/nv50_pm.c

+5 −2
Original line number Diff line number Diff line
@@ -562,8 +562,11 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data) 
	}

	nv_mask(dev, 0x00c040, 0x0c000c00, info->amast);



	/* core/shader: switch core to dom6, shader to hclk */

	if (dev_priv->chipset == 0x50)

	/* core/shader: make sure sclk/nvclk are disconnected from their

	 * plls (nvclk to dom6, sclk to hclk), modify the plls, and

	 * reconnect sclk/nvclk to their new clock source

	 */

	if (dev_priv->chipset < 0x92)

		nv_mask(dev, 0x00c040, 0x001000b0, 0x00100080); /* grrr! */

	else

		nv_mask(dev, 0x00c040, 0x000000b3, 0x00000081);