forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e 
 kernel/drivers/video/rockchip/rga3/rga_hw_config.c
....@@ -175,12 +175,12 @@
175175 const struct rga_win_data rga3_win_data[] = {
176176 	{
177177 		.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),
184184 		.supported_rotations = RGA_MODE_ROTATE_MASK,
185185 		.scale_up_mode = RGA_SCALE_UP_BIC,
186186 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
....@@ -190,12 +190,12 @@
190190 
191191 	{
192192 		.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),
199199 		.supported_rotations = RGA_MODE_ROTATE_MASK,
200200 		.scale_up_mode = RGA_SCALE_UP_BIC,
201201 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
....@@ -205,12 +205,12 @@
205205 
206206 	{
207207 		.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),
214214 		.supported_rotations = 0,
215215 		.scale_up_mode = RGA_SCALE_UP_NONE,
216216 		.scale_down_mode = RGA_SCALE_DOWN_NONE,
....@@ -222,8 +222,8 @@
222222 const struct rga_win_data rga2e_win_data[] = {
223223 	{
224224 		.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),
227227 		.supported_rotations = RGA_MODE_ROTATE_MASK,
228228 		.scale_up_mode = RGA_SCALE_UP_BIC,
229229 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
....@@ -233,8 +233,8 @@
233233 
234234 	{
235235 		.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),
238238 		.supported_rotations = RGA_MODE_ROTATE_MASK,
239239 		.scale_up_mode = RGA_SCALE_UP_BIC,
240240 		.scale_down_mode = RGA_SCALE_DOWN_AVG,
....@@ -244,8 +244,8 @@
244244 
245245 	{
246246 		.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),
249249 		.supported_rotations = 0,
250250 		.scale_up_mode = RGA_SCALE_UP_NONE,
251251 		.scale_down_mode = RGA_SCALE_DOWN_NONE,
....@@ -292,9 +292,8 @@
292292 
293293 	.feature = RGA_COLOR_FILL | RGA_COLOR_PALETTE |
294294 		   RGA_COLOR_KEY | RGA_ROP_CALCULATE |
295
-		   RGA_NN_QUANTIZE | RGA_DITHER,
296
-	.csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |
297
-			RGA_MODE_CSC_BT709,
295
+		   RGA_NN_QUANTIZE | RGA_DITHER | RGA_FULL_CSC,
296
+	.csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F,
298297 	.csc_y2r_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |
299298 			RGA_MODE_CSC_BT709,
300299 	.mmu = RGA_MMU,
....@@ -318,7 +317,7 @@
318317 		   RGA_COLOR_KEY | RGA_ROP_CALCULATE |
319318 		   RGA_NN_QUANTIZE | RGA_DITHER | RGA_MOSAIC |
320319 		   RGA_YIN_YOUT | RGA_YUV_HDS | RGA_YUV_VDS |
321
-		   RGA_OSD | RGA_PRE_INTR,
320
+		   RGA_OSD | RGA_PRE_INTR | RGA_FULL_CSC,
322321 	.csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |
323322 			RGA_MODE_CSC_BT709,
324323 	.csc_y2r_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |
....@@ -344,7 +343,7 @@
344343 		   RGA_COLOR_KEY | RGA_ROP_CALCULATE |
345344 		   RGA_NN_QUANTIZE | RGA_DITHER | RGA_MOSAIC |
346345 		   RGA_YIN_YOUT | RGA_YUV_HDS | RGA_YUV_VDS |
347
-		   RGA_OSD | RGA_PRE_INTR,
346
+		   RGA_OSD | RGA_PRE_INTR | RGA_FULL_CSC,
348347 	.csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |
349348 			RGA_MODE_CSC_BT709,
350349 	.csc_y2r_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F |