kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
..
..
@@ -1,4 +1,4 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
1
+/* SPDX-License-Identifier: MIT */
2
2
 #ifndef __NVKM_FB_H__
3
3
 #define __NVKM_FB_H__
4
4
 #include <core/subdev.h>
..
..
@@ -32,6 +32,8 @@
32
32
 struct nvkm_fb {
33
33
 	const struct nvkm_fb_func *func;
34
34
 	struct nvkm_subdev subdev;
35
+
36
+	struct nvkm_blob vpr_scrubber;
35
37
 
36
38
 	struct nvkm_ram *ram;
37
39
 	struct nvkm_mm tags;
..
..
@@ -105,7 +107,10 @@
105
107
 	NVKM_RAM_TYPE_GDDR2,
106
108
 	NVKM_RAM_TYPE_GDDR3,
107
109
 	NVKM_RAM_TYPE_GDDR4,
108
-	NVKM_RAM_TYPE_GDDR5
110
+	NVKM_RAM_TYPE_GDDR5,
111
+	NVKM_RAM_TYPE_GDDR5X,
112
+	NVKM_RAM_TYPE_GDDR6,
113
+	NVKM_RAM_TYPE_HBM2,
109
114
 };
110
115
 
111
116
 struct nvkm_ram {