kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/drm/nouveau/nouveau_chan.h
..
..
@@ -1,15 +1,24 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
1
+/* SPDX-License-Identifier: MIT */
2
2
 #ifndef __NOUVEAU_CHAN_H__
3
3
 #define __NOUVEAU_CHAN_H__
4
4
 #include <nvif/object.h>
5
5
 #include <nvif/notify.h>
6
+#include <nvif/push.h>
6
7
 struct nvif_device;
7
8
 
8
9
 struct nouveau_channel {
10
+	struct {
11
+		struct nvif_push _push;
12
+		struct nvif_push *push;
13
+	} chan;
14
+
9
15
 	struct nvif_device *device;
10
16
 	struct nouveau_drm *drm;
17
+	struct nouveau_vmm *vmm;
11
18
 
12
19
 	int chid;
20
+	u64 inst;
21
+	u32 token;
13
22
 
14
23
 	struct nvif_object vram;
15
24
 	struct nvif_object gart;
..
..
@@ -48,7 +57,8 @@
48
57
 int nouveau_channels_init(struct nouveau_drm *);
49
58
 
50
59
 int  nouveau_channel_new(struct nouveau_drm *, struct nvif_device *,
51
-			 u32 arg0, u32 arg1, struct nouveau_channel **);
60
+			 u32 arg0, u32 arg1, bool priv,
61
+			 struct nouveau_channel **);
52
62
 void nouveau_channel_del(struct nouveau_channel **);
53
63
 int  nouveau_channel_idle(struct nouveau_channel *);
54
64