diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-07-21 01:52:52 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 02:08:44 -0400 |
| commit | 64e740bb3d43a3abcd0b51cda3ba46b35bff30b2 (patch) | |
| tree | 5b61bb9487757d735a96661f847a451a3c32e53a /drivers/gpu | |
| parent | f2cbe46f14427914bdd191795da998588dee4b8c (diff) | |
drm/nva3/pm: use crystal freq where appropriate
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nva3_pm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nva3_pm.c b/drivers/gpu/drm/nouveau/nva3_pm.c index 16d574dbe369..ec684f56dfc6 100644 --- a/drivers/gpu/drm/nouveau/nva3_pm.c +++ b/drivers/gpu/drm/nouveau/nva3_pm.c | |||
| @@ -42,11 +42,12 @@ read_vco(struct drm_device *dev, int clk) | |||
| 42 | static u32 | 42 | static u32 |
| 43 | read_clk(struct drm_device *dev, int clk, bool ignore_en) | 43 | read_clk(struct drm_device *dev, int clk, bool ignore_en) |
| 44 | { | 44 | { |
| 45 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
| 45 | u32 sctl, sdiv, sclk; | 46 | u32 sctl, sdiv, sclk; |
| 46 | 47 | ||
| 47 | /* refclk for the 0xe8xx plls always 27KHz */ | 48 | /* refclk for the 0xe8xx plls is a fixed frequency */ |
| 48 | if (clk >= 0x40) | 49 | if (clk >= 0x40) |
| 49 | return 27000; | 50 | return dev_priv->crystal; |
| 50 | 51 | ||
| 51 | sctl = nv_rd32(dev, 0x4120 + (clk * 4)); | 52 | sctl = nv_rd32(dev, 0x4120 + (clk * 4)); |
| 52 | if (!ignore_en && !(sctl & 0x00000100)) | 53 | if (!ignore_en && !(sctl & 0x00000100)) |
| @@ -54,7 +55,7 @@ read_clk(struct drm_device *dev, int clk, bool ignore_en) | |||
| 54 | 55 | ||
| 55 | switch (sctl & 0x00003000) { | 56 | switch (sctl & 0x00003000) { |
| 56 | case 0x00000000: | 57 | case 0x00000000: |
| 57 | return 27000; | 58 | return dev_priv->crystal; |
| 58 | case 0x00002000: | 59 | case 0x00002000: |
| 59 | if (sctl & 0x00000040) | 60 | if (sctl & 0x00000040) |
| 60 | return 108000; | 61 | return 108000; |
