OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
112d20a
)
drm/nv04: Enable context switching on PFIFO init.
author
Francisco Jerez
<currojerez@riseup.net>
Sun, 11 Jul 2010 15:19:15 +0000
(17:19 +0200)
committer
Ben Skeggs
<bskeggs@redhat.com>
Tue, 13 Jul 2010 00:14:00 +0000
(10:14 +1000)
Fixes a lockup when coming back from suspend.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nv04_fifo.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/nouveau/nv04_fifo.c
b/drivers/gpu/drm/nouveau/nv04_fifo.c
index
b2c01fe
..
06cedd9
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nv04_fifo.c
+++ b/
drivers/gpu/drm/nouveau/nv04_fifo.c
@@
-292,6
+292,7
@@
nv04_fifo_init(struct drm_device *dev)
nv04_fifo_init_intr(dev);
pfifo->enable(dev);
+ pfifo->reassign(dev, true);
for (i = 0; i < dev_priv->engine.fifo.channels; i++) {
if (dev_priv->fifos[i]) {