diff options
| author | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2008-01-25 15:27:53 +1000 |
| commit | e7a41d7f5be49241480a20eb733262712e0f8dcb (patch) | |
| tree | 801c7eadf769db981dfb8a900a24ef48542958a6 /shared-core/nv50_instmem.c | |
| parent | fb9ea12438de95a6ac085879e079055eaea3daf8 (diff) | |
| parent | bfdddd218ec3e7ce3f8e765b93af35661a7bf0fd (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/drm_bo.c
linux-core/drm_drv.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/radeon_irq.c
Diffstat (limited to 'shared-core/nv50_instmem.c')
| -rw-r--r-- | shared-core/nv50_instmem.c | 4 |
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. |