Skip to content

Commit

Permalink
drm/nv50/pm: 0x84/0x86 can't use "1" for nvclk src, need 0x50 method
Browse files Browse the repository at this point in the history
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
  • Loading branch information
Ben Skeggs committed Dec 21, 2011
1 parent 0678409 commit 6805979
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/gpu/drm/nouveau/nv50_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 6805979

Please sign in to comment.