OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
496a73b
)
drm/nv50/pm: wait for all fifo-connected engines to idle before reclocking
author
Martin Peres
<martin.peres@ensi-bourges.fr>
Mon, 9 Jan 2012 05:23:10 +0000
(15:23 +1000)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 13 Mar 2012 07:08:38 +0000
(17:08 +1000)
Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv50_pm.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv50_pm.c
b/drivers/gpu/drm/nouveau/nv50_pm.c
index
0f26326
..
e677310
100644
(file)
--- 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()