hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2
kernel/drivers/gpu/drm/nouveau/nouveau_vmm.c
....@@ -22,6 +22,7 @@
2222 #include "nouveau_vmm.h"
2323 #include "nouveau_drv.h"
2424 #include "nouveau_bo.h"
25
+#include "nouveau_svm.h"
2526 #include "nouveau_mem.h"
2627
2728 void
....@@ -68,8 +69,8 @@
6869 }
6970 list_del(&vma->head);
7071 kfree(*pvma);
71
- *pvma = NULL;
7272 }
73
+ *pvma = NULL;
7374 }
7475
7576 int
....@@ -119,15 +120,16 @@
119120 void
120121 nouveau_vmm_fini(struct nouveau_vmm *vmm)
121122 {
122
- nvif_vmm_fini(&vmm->vmm);
123
+ nouveau_svmm_fini(&vmm->svmm);
124
+ nvif_vmm_dtor(&vmm->vmm);
123125 vmm->cli = NULL;
124126 }
125127
126128 int
127129 nouveau_vmm_init(struct nouveau_cli *cli, s32 oclass, struct nouveau_vmm *vmm)
128130 {
129
- int ret = nvif_vmm_init(&cli->mmu, oclass, PAGE_SIZE, 0, NULL, 0,
130
- &vmm->vmm);
131
+ int ret = nvif_vmm_ctor(&cli->mmu, "drmVmm", oclass, false, PAGE_SIZE,
132
+ 0, NULL, 0, &vmm->vmm);
131133 if (ret)
132134 return ret;
133135