kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/nouveau/nouveau_mem.c
..
..
@@ -87,12 +87,12 @@
87
87
 	nvif_vmm_put(&mem->cli->drm->client.vmm.vmm, &mem->vma[1]);
88
88
 	nvif_vmm_put(&mem->cli->drm->client.vmm.vmm, &mem->vma[0]);
89
89
 	mutex_lock(&mem->cli->drm->master.lock);
90
-	nvif_mem_fini(&mem->mem);
90
+	nvif_mem_dtor(&mem->mem);
91
91
 	mutex_unlock(&mem->cli->drm->master.lock);
92
92
 }
93
93
 
94
94
 int
95
-nouveau_mem_host(struct ttm_mem_reg *reg, struct ttm_dma_tt *tt)
95
+nouveau_mem_host(struct ttm_resource *reg, struct ttm_dma_tt *tt)
96
96
 {
97
97
 	struct nouveau_mem *mem = nouveau_mem(reg);
98
98
 	struct nouveau_cli *cli = mem->cli;
..
..
@@ -121,7 +121,7 @@
121
121
 
122
122
 	mutex_lock(&drm->master.lock);
123
123
 	cli->base.super = true;
124
-	ret = nvif_mem_init_type(mmu, cli->mem->oclass, type, PAGE_SHIFT,
124
+	ret = nvif_mem_ctor_type(mmu, "ttmHostMem", cli->mem->oclass, type, PAGE_SHIFT,
125
125
 				 reg->num_pages << PAGE_SHIFT,
126
126
 				 &args, sizeof(args), &mem->mem);
127
127
 	cli->base.super = super;
..
..
@@ -130,7 +130,7 @@
130
130
 }
131
131
 
132
132
 int
133
-nouveau_mem_vram(struct ttm_mem_reg *reg, bool contig, u8 page)
133
+nouveau_mem_vram(struct ttm_resource *reg, bool contig, u8 page)
134
134
 {
135
135
 	struct nouveau_mem *mem = nouveau_mem(reg);
136
136
 	struct nouveau_cli *cli = mem->cli;
..
..
@@ -144,7 +144,7 @@
144
144
 	cli->base.super = true;
145
145
 	switch (cli->mem->oclass) {
146
146
 	case NVIF_CLASS_MEM_GF100:
147
-		ret = nvif_mem_init_type(mmu, cli->mem->oclass,
147
+		ret = nvif_mem_ctor_type(mmu, "ttmVram", cli->mem->oclass,
148
148
 					 drm->ttm.type_vram, page, size,
149
149
 					 &(struct gf100_mem_v0) {
150
150
 						.contig = contig,
..
..
@@ -152,7 +152,7 @@
152
152
 					 &mem->mem);
153
153
 		break;
154
154
 	case NVIF_CLASS_MEM_NV50:
155
-		ret = nvif_mem_init_type(mmu, cli->mem->oclass,
155
+		ret = nvif_mem_ctor_type(mmu, "ttmVram", cli->mem->oclass,
156
156
 					 drm->ttm.type_vram, page, size,
157
157
 					 &(struct nv50_mem_v0) {
158
158
 						.bankswz = mmu->kind[mem->kind] == 2,
..
..
@@ -173,7 +173,7 @@
173
173
 }
174
174
 
175
175
 void
176
-nouveau_mem_del(struct ttm_mem_reg *reg)
176
+nouveau_mem_del(struct ttm_resource *reg)
177
177
 {
178
178
 	struct nouveau_mem *mem = nouveau_mem(reg);
179
179
 	if (!mem)
..
..
@@ -185,7 +185,7 @@
185
185
 
186
186
 int
187
187
 nouveau_mem_new(struct nouveau_cli *cli, u8 kind, u8 comp,
188
-		struct ttm_mem_reg *reg)
188
+		struct ttm_resource *reg)
189
189
 {
190
190
 	struct nouveau_mem *mem;
191
191