diff options
| author | Martin Peres <martin.peres@ensi-bourges.fr> | 2012-01-09 00:23:10 -0500 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-03-13 03:08:38 -0400 |
| commit | c57ebf5ef3588d21031f12e39131d79071269845 (patch) | |
| tree | a86aaf855e14b30ca8d9ec28827826e85d70a46c /drivers/gpu | |
| parent | 496a73bbecb81e6753715995e4519d152f814667 (diff) | |
drm/nv50/pm: wait for all fifo-connected engines to idle before reclocking
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_pm.c b/drivers/gpu/drm/nouveau/nv50_pm.c index 0f2632638c92..e677310c8f57 100644 --- a/drivers/gpu/drm/nouveau/nv50_pm.c +++ b/drivers/gpu/drm/nouveau/nv50_pm.c | |||
| @@ -798,6 +798,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data) | |||
| 798 | nv_mask(dev, 0x002504, 0x00000001, 0x00000001); | 798 | nv_mask(dev, 0x002504, 0x00000001, 0x00000001); |
| 799 | if (!nv_wait(dev, 0x002504, 0x00000010, 0x00000010)) | 799 | if (!nv_wait(dev, 0x002504, 0x00000010, 0x00000010)) |
| 800 | goto resume; | 800 | goto resume; |
| 801 | if (!nv_wait(dev, 0x00251c, 0x0000003f, 0x0000003f)) | ||
| 802 | goto resume; | ||
| 801 | 803 | ||
| 802 | /* program memory clock, if necessary - must come before engine clock | 804 | /* program memory clock, if necessary - must come before engine clock |
| 803 | * reprogramming due to how we construct the hwsq scripts in pre() | 805 | * reprogramming due to how we construct the hwsq scripts in pre() |