aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.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/core/engine/fifo/nve0.c
parent9da226f698c01b268b9172050df4150f269a7613 (diff)
downloadvexpress-lsk-18c9b959fd8ea6f3602efbedad788f53e305e6f1.tar.gz
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/core/engine/fifo/nve0.c')
-rw-r--r--drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
index 829959fac14..1c06bde1bcc 100644
--- a/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
+++ b/drivers/gpu/drm/nouveau/core/engine/fifo/nve0.c
@@ -402,7 +402,7 @@ nve0_fifo_destroy(struct drm_device *dev, int engine)
struct nve0_fifo_priv *priv = nv_engine(dev, engine);
int i;
- nouveau_vm_put(&priv->user.bar);
+ nouveau_gpuobj_unmap(&priv->user.bar);
nouveau_gpuobj_ref(NULL, &priv->user.mem);
for (i = 0; i < NVE0_FIFO_ENGINE_NUM; i++) {
@@ -438,13 +438,11 @@ nve0_fifo_create(struct drm_device *dev)
if (ret)
goto error;
- ret = nouveau_vm_get(dev_priv->bar1_vm, priv->user.mem->size,
- 12, NV_MEM_ACCESS_RW, &priv->user.bar);
+ ret = nouveau_gpuobj_map_bar(priv->user.mem, NV_MEM_ACCESS_RW,
+ &priv->user.bar);
if (ret)
goto error;
- nouveau_vm_map(&priv->user.bar, *(struct nouveau_mem **)priv->user.mem->node);
-
nouveau_irq_register(dev, 8, nve0_fifo_isr);
error:
if (ret)