diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-07-11 17:19:15 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-13 02:14:00 +0200 |
| commit | dad9acff504257d37058d3452c978a4129944d99 (patch) | |
| tree | ed359dd06de6f02a9306c41ca5260758b7e80308 | |
| parent | drm/nouveau: Disable PROM access on init. (diff) | |
| download | linux-dad9acff504257d37058d3452c978a4129944d99.tar.xz linux-dad9acff504257d37058d3452c978a4129944d99.zip | |
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>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv04_fifo.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nv04_fifo.c b/drivers/gpu/drm/nouveau/nv04_fifo.c index b2c01fe899e9..06cedd99c26a 100644 --- 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]) { |