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>
This commit is contained in:
Martin Peres 2012-01-09 15:23:10 +10:00 committed by Ben Skeggs
parent 496a73bbec
commit c57ebf5ef3
1 changed files with 2 additions and 0 deletions

View File

@ -798,6 +798,8 @@ nv50_pm_clocks_set(struct drm_device *dev, void *data)
nv_mask(dev, 0x002504, 0x00000001, 0x00000001);
if (!nv_wait(dev, 0x002504, 0x00000010, 0x00000010))
goto resume;
if (!nv_wait(dev, 0x00251c, 0x0000003f, 0x0000003f))
goto resume;
/* program memory clock, if necessary - must come before engine clock
* reprogramming due to how we construct the hwsq scripts in pre()