drm/nv04: Enable context switching on PFIFO init.

Fixes a lockup when coming back from suspend.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c
index b2c01fe899e9795fb8f6a8d765d8a7ad8d1f3e9c..06cedd99c26a3a72e4fc18d1f743a19a374a8706 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]) {