summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2012-07-13 17:05:35 +1000
committerBen Skeggs <bskeggs@redhat.com>2012-10-03 13:12:51 +1000
commit18c9b959fd8ea6f3602efbedad788f53e305e6f1 (patch)
treefdbc2c4dfb79fc0793fa6946882bc6aa9b0ed2c3 /drivers/gpu/drm/nouveau/nouveau_gpuobj.c
parent9da226f698c01b268b9172050df4150f269a7613 (diff)
drm/nouveau/gpuobj: create wrapper functions for mapping gpuobj into vm/bar
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_gpuobj.c')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gpuobj.c31
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
index 69c6a2ec4a0..4f8020d565a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gpuobj.c
@@ -806,3 +806,34 @@ nv_wo32(struct nouveau_gpuobj *gpuobj, u32 offset, u32 val)
nv_wi32(dev, gpuobj->pinst + offset, val);
}
+
+int
+nouveau_gpuobj_map_vm(struct nouveau_gpuobj *gpuobj, u32 flags,
+ struct nouveau_vm *vm, struct nouveau_vma *vma)
+{
+ struct nouveau_mem **mem = gpuobj->node;
+ struct nouveau_mem *node = *mem;
+ int ret;
+
+ ret = nouveau_vm_get(vm, node->size << 12, 12, flags, vma);
+ if (ret)
+ return ret;
+
+ nouveau_vm_map(vma, node);
+ return 0;
+}
+
+int
+nouveau_gpuobj_map_bar(struct nouveau_gpuobj *gpuobj, u32 flags,
+ struct nouveau_vma *vma)
+{
+ struct drm_nouveau_private *dev_priv = gpuobj->dev->dev_private;
+ return nouveau_gpuobj_map_vm(gpuobj, flags, dev_priv->bar1_vm, vma);
+}
+
+void
+nouveau_gpuobj_unmap(struct nouveau_vma *vma)
+{
+ nouveau_vm_unmap(vma);
+ nouveau_vm_put(vma);
+}