kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/nouveau/nouveau_mem.h
..
..
@@ -7,7 +7,7 @@
7
7
 #include <nvif/vmm.h>
8
8
 
9
9
 static inline struct nouveau_mem *
10
-nouveau_mem(struct ttm_mem_reg *reg)
10
+nouveau_mem(struct ttm_resource *reg)
11
11
 {
12
12
 	return reg->mm_node;
13
13
 }
..
..
@@ -21,10 +21,10 @@
21
21
 };
22
22
 
23
23
 int nouveau_mem_new(struct nouveau_cli *, u8 kind, u8 comp,
24
-		    struct ttm_mem_reg *);
25
-void nouveau_mem_del(struct ttm_mem_reg *);
26
-int nouveau_mem_vram(struct ttm_mem_reg *, bool contig, u8 page);
27
-int nouveau_mem_host(struct ttm_mem_reg *, struct ttm_dma_tt *);
24
+		    struct ttm_resource *);
25
+void nouveau_mem_del(struct ttm_resource *);
26
+int nouveau_mem_vram(struct ttm_resource *, bool contig, u8 page);
27
+int nouveau_mem_host(struct ttm_resource *, struct ttm_dma_tt *);
28
28
 void nouveau_mem_fini(struct nouveau_mem *);
29
29
 int nouveau_mem_map(struct nouveau_mem *, struct nvif_vmm *, struct nvif_vma *);
30
30
 #endif