drm/nv04: Enable context switching on PFIFO init.
authorFrancisco Jerez <currojerez@riseup.net>
Sun, 11 Jul 2010 15:19:15 +0000 (17:19 +0200)
committerBen 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

index b2c01fe899e9795fb8f6a8d765d8a7ad8d1f3e9c..06cedd99c26a3a72e4fc18d1f743a19a374a8706 100644 (file)
@@ -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]) {