diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-13 07:21:22 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-03 03:12:51 (GMT) |
| commit | 73a60c0d218a292f8ef29d3467726ff26ed366fc (patch) | |
| tree | 92e29ec2b7cbb3b501ac8a56d6f9e3f5bd2c957d /drivers/gpu/drm/nouveau/core/subdev/instmem | |
| parent | 18c9b959fd8ea6f3602efbedad788f53e305e6f1 (diff) | |
| download | linux-fsl-qoriq-73a60c0d218a292f8ef29d3467726ff26ed366fc.tar.xz | |
drm/nouveau/gpuobj: remove flags for vm-mappings
Having GPUOBJ and VM intertwined like this makes it *really* hard to
continue porting to the new driver architecture, split it out in
favour of requiring explit maps be the caller.
It's more flexible and obvious this way anyway...
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/core/subdev/instmem')
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c index 24d077a..be7344d 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c @@ -328,24 +328,6 @@ nv50_instmem_get(struct nouveau_gpuobj *gpuobj, struct nouveau_channel *chan, } gpuobj->vinst = node->vram->offset; - - if (gpuobj->flags & NVOBJ_FLAG_VM) { - u32 flags = NV_MEM_ACCESS_RW; - if (!(gpuobj->flags & NVOBJ_FLAG_VM_USER)) - flags |= NV_MEM_ACCESS_SYS; - - ret = nouveau_vm_get(chan->vm, size, 12, flags, - &node->chan_vma); - if (ret) { - nvfb_vram_put(dev, &node->vram); - kfree(node); - return ret; - } - - nouveau_vm_map(&node->chan_vma, node->vram); - gpuobj->linst = node->chan_vma.offset; - } - gpuobj->size = size; gpuobj->node = node; return 0; |