summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-01-07 18:18:51 +1100
committerBen Skeggs <skeggsb@gmail.com>2008-01-07 18:19:16 +1100
commit942b500e24fba25e3e047c7756b75a2782076512 (patch)
tree2bcf4e7b6f35cd654808d95252b55bbb7d9b09d3 /shared-core
parent3d248cd7e4538ced5c0b652a784eb4ef309d5e11 (diff)
nv50: oops, lost some state saving along the way somewhere.
xf86-video-nv will now work again after nouveau.
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/nv50_instmem.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/shared-core/nv50_instmem.c b/shared-core/nv50_instmem.c
index c80574a9..9687ecbb 100644
--- a/shared-core/nv50_instmem.c
+++ b/shared-core/nv50_instmem.c
@@ -69,6 +69,10 @@ nv50_instmem_init(struct drm_device *dev)
return -ENOMEM;
dev_priv->Engine.instmem.priv = priv;
+ /* Save state, will restore at takedown. */
+ for (i = 0x1700; i <= 0x1710; i+=4)
+ priv->save1700[(i-0x1700)/4] = NV_READ(i);
+
/* Reserve the last MiB of VRAM, we should probably try to avoid
* setting up the below tables over the top of the VBIOS image at
* some point.