diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:09 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:16 +1000 |
| commit | 83f56106ead017a07868176279746d73bc7a7060 (patch) | |
| tree | 714e684b2d2d9dbada3f577f51427056f69a83fd /drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c | |
| parent | 25e3a463fc1bd39c01cc6d19d2c8b4c4725699b9 (diff) | |
drm/nouveau/mmu: switch to device pri macros
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c index 982f7c707934..3551b55a5646 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gf100.c @@ -154,7 +154,8 @@ static void gf100_vm_flush(struct nvkm_vm *vm) { struct nvkm_mmu *mmu = (void *)vm->mmu; - struct nvkm_bar *bar = nvkm_bar(mmu); + struct nvkm_device *device = mmu->subdev.device; + struct nvkm_bar *bar = device->bar; struct nvkm_vm_pgd *vpgd; u32 type; @@ -171,16 +172,16 @@ gf100_vm_flush(struct nvkm_vm *vm) */ if (!nv_wait_ne(mmu, 0x100c80, 0x00ff0000, 0x00000000)) { nv_error(mmu, "vm timeout 0: 0x%08x %d\n", - nv_rd32(mmu, 0x100c80), type); + nvkm_rd32(device, 0x100c80), type); } - nv_wr32(mmu, 0x100cb8, vpgd->obj->addr >> 8); - nv_wr32(mmu, 0x100cbc, 0x80000000 | type); + nvkm_wr32(device, 0x100cb8, vpgd->obj->addr >> 8); + nvkm_wr32(device, 0x100cbc, 0x80000000 | type); /* wait for flush to be queued? */ if (!nv_wait(mmu, 0x100c80, 0x00008000, 0x00008000)) { nv_error(mmu, "vm timeout 1: 0x%08x %d\n", - nv_rd32(mmu, 0x100c80), type); + nvkm_rd32(device, 0x100c80), type); } } mutex_unlock(&nv_subdev(mmu)->mutex); |