diff options
| author | Martin Peres <martin.peres@ensi-bourges.fr> | 2011-07-04 09:41:34 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-09-20 16:04:42 +1000 |
| commit | f3f2f54e11ff6f3f39a108bfcf7e074b282e3a50 (patch) | |
| tree | 7034c50f0427c4c653158abf6f61a4882b7e335e | |
| parent | 591b06d73bb8a2da879b1159342b8be192bf1119 (diff) | |
| download | op-kernel-dev-f3f2f54e11ff6f3f39a108bfcf7e074b282e3a50.zip op-kernel-dev-f3f2f54e11ff6f3f39a108bfcf7e074b282e3a50.tar.gz | |
drm/nv04/pm: recalibrate timer on nvclk changes
Signed-off-by: Martin Peres <martin.peres@ensi-bourges.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_pm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_pm.c b/drivers/gpu/drm/nouveau/nv04_pm.c index eb1c70d..9ae92a8 100644 --- a/drivers/gpu/drm/nouveau/nv04_pm.c +++ b/drivers/gpu/drm/nouveau/nv04_pm.c @@ -68,6 +68,7 @@ void nv04_pm_clock_set(struct drm_device *dev, void *pre_state) { struct drm_nouveau_private *dev_priv = dev->dev_private; + struct nouveau_timer_engine *ptimer = &dev_priv->engine.timer; struct nv04_pm_state *state = pre_state; u32 reg = state->pll.reg; @@ -85,6 +86,9 @@ nv04_pm_clock_set(struct drm_device *dev, void *pre_state) nv_mask(dev, 0x1002c0, 0, 1 << 8); } + if (reg == NV_PRAMDAC_NVPLL_COEFF) + ptimer->init(dev); + kfree(state); } |
