From: Martin Peres Date: Mon, 9 Jan 2012 05:23:10 +0000 (+1000) Subject: drm/nv50/pm: wait for all fifo-connected engines to idle before reclocking X-Git-Tag: Ubuntu-5.10.0-12.13~21933^2~61^2~32 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c57ebf5ef3588d21031f12e39131d79071269845;p=mirror_ubuntu-hirsute-kernel.git drm/nv50/pm: wait for all fifo-connected engines to idle before reclocking Signed-off-by: Martin Peres Signed-off-by: Ben Skeggs --- 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) 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()