projects
/
profile
/
ivi
/
libdrm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d248cd
)
nv50: oops, lost some state saving along the way somewhere.
author
Ben Skeggs
<skeggsb@gmail.com>
Mon, 7 Jan 2008 07:18:51 +0000
(18:18 +1100)
committer
Ben Skeggs
<skeggsb@gmail.com>
Mon, 7 Jan 2008 07:19:16 +0000
(18:19 +1100)
xf86-video-nv will now work again after nouveau.
shared-core/nv50_instmem.c
patch
|
blob
|
history
diff --git
a/shared-core/nv50_instmem.c
b/shared-core/nv50_instmem.c
index
c80574a
..
9687ecb
100644
(file)
--- 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.