aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-07-21 01:54:48 -0400
committerBen Skeggs <bskeggs@redhat.com>2011-09-20 02:08:50 -0400
commit378f85ed54a424bc7e1edb9c3c7cd3a7efef9f9c (patch)
treef5cc8524d585b6004fd2518919fcaebb054e7a3a /drivers/gpu
parent64e740bb3d43a3abcd0b51cda3ba46b35bff30b2 (diff)
drm/nva3/pm: fixup for NVAF special
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nva3_pm.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c
index ec684f56dfc6..618c144b7a30 100644
--- a/drivers/gpu/drm/nouveau/nva3_pm.c
+++ b/drivers/gpu/drm/nouveau/nva3_pm.c
@@ -46,8 +46,14 @@ read_clk(struct drm_device *dev, int clk, bool ignore_en)
46 u32 sctl, sdiv, sclk; 46 u32 sctl, sdiv, sclk;
47 47
48 /* refclk for the 0xe8xx plls is a fixed frequency */ 48 /* refclk for the 0xe8xx plls is a fixed frequency */
49 if (clk >= 0x40) 49 if (clk >= 0x40) {
50 if (dev_priv->chipset == 0xaf) {
51 /* no joke.. seriously.. sigh.. */
52 return nv_rd32(dev, 0x00471c) * 1000;
53 }
54
50 return dev_priv->crystal; 55 return dev_priv->crystal;
56 }
51 57
52 sctl = nv_rd32(dev, 0x4120 + (clk * 4)); 58 sctl = nv_rd32(dev, 0x4120 + (clk * 4));
53 if (!ignore_en && !(sctl & 0x00000100)) 59 if (!ignore_en && !(sctl & 0x00000100))