diff options
| author | Ben Skeggs | 2017-10-31 18:56:19 +0100 |
|---|---|---|
| committer | Ben Skeggs | 2017-11-02 04:32:20 +0100 |
| commit | 0b11b30de9d2960d87373e50223800c8f9f6a89f (patch) | |
| tree | a0b6318c4d9254442d13c02ecb9c392c95d9470b /drivers/gpu/drm/nouveau/nouveau_ttm.c | |
| parent | drm/nouveau/imem: use fast-path for resume restore (diff) | |
| download | kernel-qcow2-linux-0b11b30de9d2960d87373e50223800c8f9f6a89f.tar.gz kernel-qcow2-linux-0b11b30de9d2960d87373e50223800c8f9f6a89f.tar.xz kernel-qcow2-linux-0b11b30de9d2960d87373e50223800c8f9f6a89f.zip | |
drm/nouveau/mmu/nv04-nv4x: move global vmm to nvkm_mmu
In a future commit, this will be constructed by common code.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_ttm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ttm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c index ffc3458c89de..65511f320a3a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ttm.c +++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c @@ -192,16 +192,13 @@ const struct ttm_mem_type_manager_func nouveau_gart_manager = { .debug = nouveau_gart_manager_debug }; -/*XXX*/ -#include <subdev/mmu/nv04.h> static int nv04_gart_manager_init(struct ttm_mem_type_manager *man, unsigned long psize) { struct nouveau_drm *drm = nouveau_bdev(man->bdev); struct nvkm_mmu *mmu = nvxx_mmu(&drm->client.device); - struct nv04_mmu *priv = (void *)mmu; struct nvkm_vm *vm = NULL; - nvkm_vm_ref(priv->vm, &vm, NULL); + nvkm_vm_ref(mmu->vmm, &vm, NULL); man->priv = vm; return 0; } |