diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-07-11 11:19:15 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:14:00 -0400 |
| commit | dad9acff504257d37058d3452c978a4129944d99 (patch) | |
| tree | ed359dd06de6f02a9306c41ca5260758b7e80308 /drivers/gpu/drm/nouveau | |
| parent | 112d20ad5ca06a9ec7237602ee33bef6fa881daa (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -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) | |||
| 292 | 292 | ||
| 293 | nv04_fifo_init_intr(dev); | 293 | nv04_fifo_init_intr(dev); |
| 294 | pfifo->enable(dev); | 294 | pfifo->enable(dev); |
| 295 | pfifo->reassign(dev, true); | ||
| 295 | 296 | ||
| 296 | for (i = 0; i < dev_priv->engine.fifo.channels; i++) { | 297 | for (i = 0; i < dev_priv->engine.fifo.channels; i++) { |
| 297 | if (dev_priv->fifos[i]) { | 298 | if (dev_priv->fifos[i]) { |