kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/nouveau/include/nvif/mmu.h
..
..
@@ -7,6 +7,7 @@
7
7
 	u8  dmabits;
8
8
 	u8  heap_nr;
9
9
 	u8  type_nr;
10
+	u8  kind_inv;
10
11
 	u16 kind_nr;
11
12
 	s32 mem;
12
13
 
..
..
@@ -30,15 +31,15 @@
30
31
 	u8 *kind;
31
32
 };
32
33
 
33
-int nvif_mmu_init(struct nvif_object *, s32 oclass, struct nvif_mmu *);
34
-void nvif_mmu_fini(struct nvif_mmu *);
34
+int nvif_mmu_ctor(struct nvif_object *, const char *name, s32 oclass,
35
+		  struct nvif_mmu *);
36
+void nvif_mmu_dtor(struct nvif_mmu *);
35
37
 
36
38
 static inline bool
37
39
 nvif_mmu_kind_valid(struct nvif_mmu *mmu, u8 kind)
38
40
 {
39
-	const u8 invalid = mmu->kind_nr - 1;
40
41
 	if (kind) {
41
-		if (kind >= mmu->kind_nr || mmu->kind[kind] == invalid)
42
+		if (kind >= mmu->kind_nr || mmu->kind[kind] == mmu->kind_inv)
42
43
 			return false;
43
44
 	}
44
45
 	return true;