diff options
| author | Ben Skeggs | 2011-05-25 09:22:43 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2011-06-23 07:57:33 +0200 |
| commit | f8522fc80f2e0392fc44b069f61721bd25907270 (patch) | |
| tree | 0a28182341f949766fd9efc5567fd88e50a7384e /drivers/gpu/drm/nouveau/nv50_instmem.c | |
| parent | drm/nouveau: default to noaccel on 0xc1/0xc8/0xce for now (diff) | |
| download | kernel-qcow2-linux-f8522fc80f2e0392fc44b069f61721bd25907270.tar.gz kernel-qcow2-linux-f8522fc80f2e0392fc44b069f61721bd25907270.tar.xz kernel-qcow2-linux-f8522fc80f2e0392fc44b069f61721bd25907270.zip | |
drm/nvc0: fix suspend/resume of PGRAPH/PCOPYn
We need the physical VRAM address in vinst, even for objects mapped into
a vm, as the gpuobj suspend/resume code uses PMEM to access the object.
Previously, vinst was overloaded to mean "VRAM address" for !VM objects,
and "VM address" for VM objects, causing the wrong data to be accessed
during suspend/resume.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_instmem.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_instmem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 4f95a1e5822e..ccea671346c9 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -305,7 +305,6 @@ struct nv50_gpuobj_node { u32 align; }; - int nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align) { @@ -345,7 +344,7 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align) } nouveau_vm_map(&node->chan_vma, node->vram); - gpuobj->vinst = node->chan_vma.offset; + gpuobj->linst = node->chan_vma.offset; } gpuobj->size = size; |