update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/video/rockchip/rga3/rga_hw_config.c
..
..
@@ -175,12 +175,12 @@
175
175
 const struct rga_win_data rga3_win_data[] = {
176
176
 	{
177
177
 		.name = "rga3-win0",
178
-		.raster_formats = rga3_input_raster_format,
179
-		.num_of_raster_formats = ARRAY_SIZE(rga3_input_raster_format),
180
-		.fbc_formats = rga3_fbcd_format,
181
-		.num_of_fbc_formats = ARRAY_SIZE(rga3_fbcd_format),
182
-		.tile_formats = rga3_tile_format,
183
-		.num_of_tile_formats = ARRAY_SIZE(rga3_tile_format),
178
+		.formats[RGA_RASTER_INDEX] = rga3_input_raster_format,
179
+		.formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga3_input_raster_format),
180
+		.formats[RGA_AFBC16x16_INDEX] = rga3_fbcd_format,
181
+		.formats_count[RGA_AFBC16x16_INDEX] = ARRAY_SIZE(rga3_fbcd_format),
182
+		.formats[RGA_TILE8x8_INDEX] = rga3_tile_format,
183
+		.formats_count[RGA_TILE8x8_INDEX] = ARRAY_SIZE(rga3_tile_format),
184
184
 		.supported_rotations = RGA_MODE_ROTATE_MASK,
185
185
 		.scale_up_mode = RGA_SCALE_UP_BIC,
186
186
 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
..
..
@@ -190,12 +190,12 @@
190
190
 
191
191
 	{
192
192
 		.name = "rga3-win1",
193
-		.raster_formats = rga3_input_raster_format,
194
-		.num_of_raster_formats = ARRAY_SIZE(rga3_input_raster_format),
195
-		.fbc_formats = rga3_fbcd_format,
196
-		.num_of_fbc_formats = ARRAY_SIZE(rga3_fbcd_format),
197
-		.tile_formats = rga3_tile_format,
198
-		.num_of_tile_formats = ARRAY_SIZE(rga3_tile_format),
193
+		.formats[RGA_RASTER_INDEX] = rga3_input_raster_format,
194
+		.formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga3_input_raster_format),
195
+		.formats[RGA_AFBC16x16_INDEX] = rga3_fbcd_format,
196
+		.formats_count[RGA_AFBC16x16_INDEX] = ARRAY_SIZE(rga3_fbcd_format),
197
+		.formats[RGA_TILE8x8_INDEX] = rga3_tile_format,
198
+		.formats_count[RGA_TILE8x8_INDEX] = ARRAY_SIZE(rga3_tile_format),
199
199
 		.supported_rotations = RGA_MODE_ROTATE_MASK,
200
200
 		.scale_up_mode = RGA_SCALE_UP_BIC,
201
201
 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
..
..
@@ -205,12 +205,12 @@
205
205
 
206
206
 	{
207
207
 		.name = "rga3-wr",
208
-		.raster_formats = rga3_output_raster_format,
209
-		.num_of_raster_formats = ARRAY_SIZE(rga3_output_raster_format),
210
-		.fbc_formats = rga3_fbcd_format,
211
-		.num_of_fbc_formats = ARRAY_SIZE(rga3_fbcd_format),
212
-		.tile_formats = rga3_tile_format,
213
-		.num_of_tile_formats = ARRAY_SIZE(rga3_tile_format),
208
+		.formats[RGA_RASTER_INDEX] = rga3_output_raster_format,
209
+		.formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga3_output_raster_format),
210
+		.formats[RGA_AFBC16x16_INDEX] = rga3_fbcd_format,
211
+		.formats_count[RGA_AFBC16x16_INDEX] = ARRAY_SIZE(rga3_fbcd_format),
212
+		.formats[RGA_TILE8x8_INDEX] = rga3_tile_format,
213
+		.formats_count[RGA_TILE8x8_INDEX] = ARRAY_SIZE(rga3_tile_format),
214
214
 		.supported_rotations = 0,
215
215
 		.scale_up_mode = RGA_SCALE_UP_NONE,
216
216
 		.scale_down_mode = RGA_SCALE_DOWN_NONE,
..
..
@@ -222,8 +222,8 @@
222
222
 const struct rga_win_data rga2e_win_data[] = {
223
223
 	{
224
224
 		.name = "rga2e-src0",
225
-		.raster_formats = rga2e_input_raster_format,
226
-		.num_of_raster_formats = ARRAY_SIZE(rga2e_input_raster_format),
225
+		.formats[RGA_RASTER_INDEX] = rga2e_input_raster_format,
226
+		.formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga2e_input_raster_format),
227
227
 		.supported_rotations = RGA_MODE_ROTATE_MASK,
228
228
 		.scale_up_mode = RGA_SCALE_UP_BIC,
229
229
 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
..
..
@@ -233,8 +233,8 @@
233
233
 
234
234
 	{
235
235
 		.name = "rga2e-src1",
236
-		.raster_formats = rga2e_input_raster_format,
237
-		.num_of_raster_formats = ARRAY_SIZE(rga2e_input_raster_format),
236
+		.formats[RGA_RASTER_INDEX] = rga2e_input_raster_format,
237
+		.formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga2e_input_raster_format),
238
238
 		.supported_rotations = RGA_MODE_ROTATE_MASK,
239
239
 		.scale_up_mode = RGA_SCALE_UP_BIC,
240
240
 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
..
..
@@ -244,8 +244,8 @@
244
244
 
245
245
 	{
246
246
 		.name = "rga2-dst",
247
-		.raster_formats = rga2e_output_raster_format,
248
-		.num_of_raster_formats = ARRAY_SIZE(rga2e_output_raster_format),
247
+		.formats[RGA_RASTER_INDEX] = rga2e_output_raster_format,
248
+		.formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga2e_output_raster_format),
249
249
 		.supported_rotations = 0,
250
250
 		.scale_up_mode = RGA_SCALE_UP_NONE,
251
251
 		.scale_down_mode = RGA_SCALE_DOWN_NONE,