diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:20 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:42 +1000 |
commit | 3293228174e4d44cca56d809cc8409c3f88f8b90 (patch) | |
tree | 6f0f038f3fad704948e4b80a9dd9fe8180fc9a23 /drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | |
parent | drm/nouveau/core: kill some (now) dead code (diff) | |
download | linux-dev-3293228174e4d44cca56d809cc8409c3f88f8b90.tar.xz linux-dev-3293228174e4d44cca56d809cc8409c3f88f8b90.zip |
drm/nouveau/bar: convert to new-style nvkm_subdev
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c index 535a8f9c23ce..af236f8e4ddc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/instmem/nv50.c @@ -111,7 +111,7 @@ nv50_instobj_acquire(struct nvkm_memory *memory) struct nvkm_vm *vm; unsigned long flags; - if (!iobj->map && bar && bar->kmap && (vm = bar->kmap(bar))) + if (!iobj->map && (vm = nvkm_bar_kmap(bar))) nvkm_memory_boot(memory, vm); if (!IS_ERR_OR_NULL(iobj->map)) return iobj->map; |