diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2011-04-12 19:38:06 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-05-16 10:49:22 +1000 |
| commit | 0638df425f65d1f413b36e53acd1fb689679cabe (patch) | |
| tree | eb4ea908006dfb5a0e1337d5b068b058435526c4 | |
| parent | 7a5c23de36002d611609650e49ef0ebd46f5c141 (diff) | |
| download | kernel_samsung_smdk4412-0638df425f65d1f413b36e53acd1fb689679cabe.zip kernel_samsung_smdk4412-0638df425f65d1f413b36e53acd1fb689679cabe.tar.gz kernel_samsung_smdk4412-0638df425f65d1f413b36e53acd1fb689679cabe.tar.bz2 | |
drm/nvc0/fifo: restore context table on resume
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvc0_fifo.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_fifo.c b/drivers/gpu/drm/nouveau/nvc0_fifo.c index 2bd0511..be4e483 100644 --- a/drivers/gpu/drm/nouveau/nvc0_fifo.c +++ b/drivers/gpu/drm/nouveau/nvc0_fifo.c @@ -240,7 +240,6 @@ nvc0_fifo_load_context(struct nouveau_channel *chan) int nvc0_fifo_unload_context(struct drm_device *dev) { - struct drm_nouveau_private *dev_priv = dev->dev_private; int i; for (i = 0; i < 128; i++) { @@ -325,6 +324,7 @@ nvc0_fifo_init(struct drm_device *dev) { struct drm_nouveau_private *dev_priv = dev->dev_private; struct nouveau_fifo_engine *pfifo = &dev_priv->engine.fifo; + struct nouveau_channel *chan; struct nvc0_fifo_priv *priv; int ret, i; @@ -367,6 +367,19 @@ nvc0_fifo_init(struct drm_device *dev) nv_wr32(dev, 0x002a00, 0xffffffff); /* clears PFIFO.INTR bit 30 */ nv_wr32(dev, 0x002100, 0xffffffff); nv_wr32(dev, 0x002140, 0xbfffffff); + + /* restore PFIFO context table */ + for (i = 0; i < 128; i++) { + chan = dev_priv->channels.ptr[i]; + if (!chan || !chan->fifo_priv) + continue; + + nv_wr32(dev, 0x003000 + (i * 8), 0xc0000000 | + (chan->ramin->vinst >> 12)); + nv_wr32(dev, 0x003004 + (i * 8), 0x001f0001); + } + nvc0_fifo_playlist_update(dev); + return 0; } |