aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-08-04 22:48:34 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-08-06 08:35:54 +1000
commit147cad0936f3c59ec5678fe47319e44e3ea44d87 (patch)
tree1a974459f4a4a621538db49a6281a9069dc6c98c
parentb715d64028ea90bcb67b3823ae1cc908a4ae0bc6 (diff)
downloadkernel_samsung_smdk4412-147cad0936f3c59ec5678fe47319e44e3ea44d87.zip
kernel_samsung_smdk4412-147cad0936f3c59ec5678fe47319e44e3ea44d87.tar.gz
kernel_samsung_smdk4412-147cad0936f3c59ec5678fe47319e44e3ea44d87.tar.bz2
drm/nvc0: backup bar3 channel on suspend
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvc0_instmem.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvc0_instmem.c b/drivers/gpu/drm/nouveau/nvc0_instmem.c
index e2a0bb8..e74bd45 100644
--- a/drivers/gpu/drm/nouveau/nvc0_instmem.c
+++ b/drivers/gpu/drm/nouveau/nvc0_instmem.c
@@ -141,12 +141,34 @@ nvc0_instmem_flush(struct drm_device *dev)
int
nvc0_instmem_suspend(struct drm_device *dev)
{
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ int i;
+
+ dev_priv->susres.ramin_copy = vmalloc(65536);
+ if (!dev_priv->susres.ramin_copy)
+ return -ENOMEM;
+
+ for (i = 0x700000; i < 0x710000; i += 4)
+ dev_priv->susres.ramin_copy[i/4] = nv_rd32(dev, i);
return 0;
}
void
nvc0_instmem_resume(struct drm_device *dev)
{
+ struct drm_nouveau_private *dev_priv = dev->dev_private;
+ u64 chan;
+ int i;
+
+ chan = dev_priv->vram_size - dev_priv->ramin_rsvd_vram;
+ nv_wr32(dev, 0x001700, chan >> 16);
+
+ for (i = 0x700000; i < 0x710000; i += 4)
+ nv_wr32(dev, i, dev_priv->susres.ramin_copy[i/4]);
+ vfree(dev_priv->susres.ramin_copy);
+ dev_priv->susres.ramin_copy = NULL;
+
+ nv_wr32(dev, 0x001714, 0xc0000000 | (chan >> 12));
}
int