AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/gpu/drm/nouveau/include/nvkm/core/device.h
..
..
@@ -1,4 +1,4 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
1
+/* SPDX-License-Identifier: MIT */
2
2
 #ifndef __NVKM_DEVICE_H__
3
3
 #define __NVKM_DEVICE_H__
4
4
 #include <core/oclass.h>
..
..
@@ -23,12 +23,13 @@
23
23
 	NVKM_SUBDEV_MMU,
24
24
 	NVKM_SUBDEV_BAR,
25
25
 	NVKM_SUBDEV_FAULT,
26
+	NVKM_SUBDEV_ACR,
26
27
 	NVKM_SUBDEV_PMU,
27
28
 	NVKM_SUBDEV_VOLT,
28
29
 	NVKM_SUBDEV_ICCSENSE,
29
30
 	NVKM_SUBDEV_THERM,
30
31
 	NVKM_SUBDEV_CLK,
31
-	NVKM_SUBDEV_SECBOOT,
32
+	NVKM_SUBDEV_GSP,
32
33
 
33
34
 	NVKM_ENGINE_BSP,
34
35
 
..
..
@@ -61,7 +62,11 @@
61
62
 	NVKM_ENGINE_NVENC2,
62
63
 	NVKM_ENGINE_NVENC_LAST = NVKM_ENGINE_NVENC2,
63
64
 
64
-	NVKM_ENGINE_NVDEC,
65
+	NVKM_ENGINE_NVDEC0,
66
+	NVKM_ENGINE_NVDEC1,
67
+	NVKM_ENGINE_NVDEC2,
68
+	NVKM_ENGINE_NVDEC_LAST = NVKM_ENGINE_NVDEC2,
69
+
65
70
 	NVKM_ENGINE_PM,
66
71
 	NVKM_ENGINE_SEC,
67
72
 	NVKM_ENGINE_SEC2,
..
..
@@ -114,6 +119,7 @@
114
119
 		GM100    = 0x110,
115
120
 		GP100    = 0x130,
116
121
 		GV100    = 0x140,
122
+		TU100    = 0x160,
117
123
 	} card_type;
118
124
 	u32 chipset;
119
125
 	u8  chiprev;
..
..
@@ -123,6 +129,7 @@
123
129
 		struct notifier_block nb;
124
130
 	} acpi;
125
131
 
132
+	struct nvkm_acr *acr;
126
133
 	struct nvkm_bar *bar;
127
134
 	struct nvkm_bios *bios;
128
135
 	struct nvkm_bus *bus;
..
..
@@ -132,6 +139,7 @@
132
139
 	struct nvkm_fb *fb;
133
140
 	struct nvkm_fuse *fuse;
134
141
 	struct nvkm_gpio *gpio;
142
+	struct nvkm_gsp *gsp;
135
143
 	struct nvkm_i2c *i2c;
136
144
 	struct nvkm_subdev *ibus;
137
145
 	struct nvkm_iccsense *iccsense;
..
..
@@ -142,7 +150,6 @@
142
150
 	struct nvkm_subdev *mxm;
143
151
 	struct nvkm_pci *pci;
144
152
 	struct nvkm_pmu *pmu;
145
-	struct nvkm_secboot *secboot;
146
153
 	struct nvkm_therm *therm;
147
154
 	struct nvkm_timer *timer;
148
155
 	struct nvkm_top *top;
..
..
@@ -162,8 +169,8 @@
162
169
 	struct nvkm_engine *mspdec;
163
170
 	struct nvkm_engine *msppp;
164
171
 	struct nvkm_engine *msvld;
165
-	struct nvkm_engine *nvenc[3];
166
-	struct nvkm_nvdec *nvdec;
172
+	struct nvkm_nvenc *nvenc[3];
173
+	struct nvkm_nvdec *nvdec[3];
167
174
 	struct nvkm_pm *pm;
168
175
 	struct nvkm_engine *sec;
169
176
 	struct nvkm_sec2 *sec2;
..
..
@@ -195,6 +202,7 @@
195
202
 struct nvkm_device_chip {
196
203
 	const char *name;
197
204
 
205
+	int (*acr     )(struct nvkm_device *, int idx, struct nvkm_acr **);
198
206
 	int (*bar     )(struct nvkm_device *, int idx, struct nvkm_bar **);
199
207
 	int (*bios    )(struct nvkm_device *, int idx, struct nvkm_bios **);
200
208
 	int (*bus     )(struct nvkm_device *, int idx, struct nvkm_bus **);
..
..
@@ -204,6 +212,7 @@
204
212
 	int (*fb      )(struct nvkm_device *, int idx, struct nvkm_fb **);
205
213
 	int (*fuse    )(struct nvkm_device *, int idx, struct nvkm_fuse **);
206
214
 	int (*gpio    )(struct nvkm_device *, int idx, struct nvkm_gpio **);
215
+	int (*gsp     )(struct nvkm_device *, int idx, struct nvkm_gsp **);
207
216
 	int (*i2c     )(struct nvkm_device *, int idx, struct nvkm_i2c **);
208
217
 	int (*ibus    )(struct nvkm_device *, int idx, struct nvkm_subdev **);
209
218
 	int (*iccsense)(struct nvkm_device *, int idx, struct nvkm_iccsense **);
..
..
@@ -214,7 +223,6 @@
214
223
 	int (*mxm     )(struct nvkm_device *, int idx, struct nvkm_subdev **);
215
224
 	int (*pci     )(struct nvkm_device *, int idx, struct nvkm_pci **);
216
225
 	int (*pmu     )(struct nvkm_device *, int idx, struct nvkm_pmu **);
217
-	int (*secboot )(struct nvkm_device *, int idx, struct nvkm_secboot **);
218
226
 	int (*therm   )(struct nvkm_device *, int idx, struct nvkm_therm **);
219
227
 	int (*timer   )(struct nvkm_device *, int idx, struct nvkm_timer **);
220
228
 	int (*top     )(struct nvkm_device *, int idx, struct nvkm_top **);
..
..
@@ -234,8 +242,8 @@
234
242
 	int (*mspdec  )(struct nvkm_device *, int idx, struct nvkm_engine **);
235
243
 	int (*msppp   )(struct nvkm_device *, int idx, struct nvkm_engine **);
236
244
 	int (*msvld   )(struct nvkm_device *, int idx, struct nvkm_engine **);
237
-	int (*nvenc[3])(struct nvkm_device *, int idx, struct nvkm_engine **);
238
-	int (*nvdec   )(struct nvkm_device *, int idx, struct nvkm_nvdec **);
245
+	int (*nvenc[3])(struct nvkm_device *, int idx, struct nvkm_nvenc **);
246
+	int (*nvdec[3])(struct nvkm_device *, int idx, struct nvkm_nvdec **);
239
247
 	int (*pm      )(struct nvkm_device *, int idx, struct nvkm_pm **);
240
248
 	int (*sec     )(struct nvkm_device *, int idx, struct nvkm_engine **);
241
249
 	int (*sec2    )(struct nvkm_device *, int idx, struct nvkm_sec2 **);