update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/gpu/drm/nouveau/dispnv04/disp.h
..
..
@@ -1,10 +1,12 @@
1
-/* SPDX-License-Identifier: GPL-2.0 */
1
+/* SPDX-License-Identifier: MIT */
2
2
 #ifndef __NV04_DISPLAY_H__
3
3
 #define __NV04_DISPLAY_H__
4
4
 #include <subdev/bios.h>
5
5
 #include <subdev/bios/pll.h>
6
6
 
7
7
 #include "nouveau_display.h"
8
+
9
+struct nouveau_encoder;
8
10
 
9
11
 enum nv04_fp_display_regs {
10
12
 	FP_DISPLAY_END,
..
..
@@ -82,6 +84,7 @@
82
84
 	uint32_t saved_vga_font[4][16384];
83
85
 	uint32_t dac_users[4];
84
86
 	struct nouveau_bo *image[2];
87
+	struct nvif_notify flip;
85
88
 };
86
89
 
87
90
 static inline struct nv04_display *
..
..
@@ -92,9 +95,8 @@
92
95
 
93
96
 /* nv04_display.c */
94
97
 int nv04_display_create(struct drm_device *);
95
-void nv04_display_destroy(struct drm_device *);
96
-int nv04_display_init(struct drm_device *);
97
-void nv04_display_fini(struct drm_device *);
98
+struct nouveau_connector *
99
+nv04_encoder_get_connector(struct nouveau_encoder *nv_encoder);
98
100
 
99
101
 /* nv04_crtc.c */
100
102
 int nv04_crtc_create(struct drm_device *, int index);
..
..
@@ -163,7 +165,6 @@
163
165
 		dev->pdev->subsystem_device == sub_device;
164
166
 }
165
167
 
166
-#include <subdev/bios.h>
167
168
 #include <subdev/bios/init.h>
168
169
 
169
170
 static inline void
..
..
@@ -176,4 +177,5 @@
176
177
 	);
177
178
 }
178
179
 
180
+int nv04_flip_complete(struct nvif_notify *);
179
181
 #endif