diff options
| author | Ben Skeggs | 2011-01-14 01:27:02 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2011-01-17 02:28:50 +0100 |
| commit | c906ca0fbf237b77ba2101a2fa9050317137fde8 (patch) | |
| tree | 1251a50df91560beca35ec047a80226b212e59b3 /drivers/gpu/drm/nouveau/nv50_instmem.c | |
| parent | drm/nv40: initialise 0x17xx on all chipsets that have it (diff) | |
| download | kernel-qcow2-linux-c906ca0fbf237b77ba2101a2fa9050317137fde8.tar.gz kernel-qcow2-linux-c906ca0fbf237b77ba2101a2fa9050317137fde8.tar.xz kernel-qcow2-linux-c906ca0fbf237b77ba2101a2fa9050317137fde8.zip | |
drm/nvc0: enable protection of system-use-only structures in vm
Somehow missed this in the original merge of the nvc0 code.
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_instmem.c b/drivers/gpu/drm/nouveau/nv50_instmem.c index 2e1b1cd19a4b..ea0041810ae3 100644 --- a/drivers/gpu/drm/nouveau/nv50_instmem.c +++ b/drivers/gpu/drm/nouveau/nv50_instmem.c @@ -332,8 +332,11 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, u32 size, u32 align) gpuobj->vinst = node->vram->offset; if (gpuobj->flags & NVOBJ_FLAG_VM) { - ret = nouveau_vm_get(dev_priv->chan_vm, size, 12, - NV_MEM_ACCESS_RW | NV_MEM_ACCESS_SYS, + u32 flags = NV_MEM_ACCESS_RW; + if (!(gpuobj->flags & NVOBJ_FLAG_VM_USER)) + flags |= NV_MEM_ACCESS_SYS; + + ret = nouveau_vm_get(dev_priv->chan_vm, size, 12, flags, &node->chan_vma); if (ret) { vram->put(dev, &node->vram); |