summaryrefslogtreecommitdiff
path: root/drm/nouveau/nvkm/engine/fifo
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2015-08-20 14:54:20 +1000
committerBen Skeggs <bskeggs@redhat.com>2015-08-28 12:37:41 +1000
commit20bada06526909dad623431d6d05dcee39150ba5 (patch)
tree9bc928584edcb324d6ec0cf42866368b6239896b /drm/nouveau/nvkm/engine/fifo
parent1933ae31b27dfe0815204eda9f4edbeb612a29e1 (diff)
downloadnouveau-20bada06526909dad623431d6d05dcee39150ba5.tar.gz
bar: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drm/nouveau/nvkm/engine/fifo')
-rw-r--r--drm/nouveau/nvkm/engine/fifo/gf100.c2
-rw-r--r--drm/nouveau/nvkm/engine/fifo/gk104.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drm/nouveau/nvkm/engine/fifo/gf100.c b/drm/nouveau/nvkm/engine/fifo/gf100.c
index bdad44e84..e8598fc44 100644
--- a/drm/nouveau/nvkm/engine/fifo/gf100.c
+++ b/drm/nouveau/nvkm/engine/fifo/gf100.c
@@ -632,7 +632,7 @@ gf100_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (ret)
return ret;
- ret = bar->umap(bar, 128 * 0x1000, 12, &fifo->user.bar);
+ ret = nvkm_bar_umap(bar, 128 * 0x1000, 12, &fifo->user.bar);
if (ret)
return ret;
diff --git a/drm/nouveau/nvkm/engine/fifo/gk104.c b/drm/nouveau/nvkm/engine/fifo/gk104.c
index e7f467997..a69f61f3e 100644
--- a/drm/nouveau/nvkm/engine/fifo/gk104.c
+++ b/drm/nouveau/nvkm/engine/fifo/gk104.c
@@ -755,7 +755,7 @@ gk104_fifo_ctor(struct nvkm_object *parent, struct nvkm_object *engine,
if (ret)
return ret;
- ret = bar->umap(bar, impl->channels * 0x200, 12, &fifo->user.bar);
+ ret = nvkm_bar_umap(bar, impl->channels * 0x200, 12, &fifo->user.bar);
if (ret)
return ret;