diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2017-01-19 22:56:30 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-01-31 19:53:14 +1000 |
| commit | cef5d6a638611e6386abe589d7c9c163b57a2e7f (patch) | |
| tree | c3e23ff360a63c102d2f40416195652081d8ef0f | |
| parent | 01f6373a8e24bd20fa9a09758abdf4322808a64b (diff) | |
| download | nouveau-cef5d6a638611e6386abe589d7c9c163b57a2e7f.tar.gz | |
nv1a,nv1f/disp: fix memory clock rate retrieval
Based on the xf86-video-nv code, NFORCE (NV1A) and NFORCE2 (NV1F) have a
different way of retrieving clocks. See the
nv_hw.c:nForceUpdateArbitrationSettings function in the original code
for how these clocks were accessed.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=54587
Cc: stable@vger.kernel.org
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/dispnv04/hw.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/nouveau/dispnv04/hw.c b/drm/nouveau/dispnv04/hw.c index 74856a8b8..e64f52464 100644 --- a/drm/nouveau/dispnv04/hw.c +++ b/drm/nouveau/dispnv04/hw.c @@ -222,6 +222,7 @@ nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype) uint32_t mpllP; pci_read_config_dword(pci_get_bus_and_slot(0, 3), 0x6c, &mpllP); + mpllP = (mpllP >> 8) & 0xf; if (!mpllP) mpllP = 4; @@ -232,7 +233,7 @@ nouveau_hw_get_clock(struct drm_device *dev, enum nvbios_pll_type plltype) uint32_t clock; pci_read_config_dword(pci_get_bus_and_slot(0, 5), 0x4c, &clock); - return clock; + return clock / 1000; } ret = nouveau_hw_get_pllvals(dev, plltype, &pllvals); |