diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-10-30 23:04:31 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-12-21 19:01:27 +1000 |
| commit | 6805979fa9090b2c69c645cf19bba9a2849f336b (patch) | |
| tree | 94e9219e1f17092d64342203d5b1dccc00ecd0f5 /drivers/gpu | |
| parent | 06784090ecb3f925616fc797164a74b03d5c0968 (diff) | |
| download | op-kernel-dev-6805979fa9090b2c69c645cf19bba9a2849f336b.zip op-kernel-dev-6805979fa9090b2c69c645cf19bba9a2849f336b.tar.gz | |
drm/nv50/pm: 0x84/0x86 can't use "1" for nvclk src, need 0x50 method
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_pm.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c index 53b6c6c..ab8cfad 100644 --- a/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/drivers/gpu/drm/nouveau/nv50_pm.c @@ -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); |
