From 9370bb92b2d16684ee45cf24e879c93c509162da Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Thu, 19 Dec 2024 01:47:39 +0000 Subject: [PATCH] add wifi6 8852be driver --- kernel/drivers/video/rockchip/rga3/rga_hw_config.c | 57 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 28 insertions(+), 29 deletions(-) diff --git a/kernel/drivers/video/rockchip/rga3/rga_hw_config.c b/kernel/drivers/video/rockchip/rga3/rga_hw_config.c index 42d7bdb..0cf2599 100644 --- a/kernel/drivers/video/rockchip/rga3/rga_hw_config.c +++ b/kernel/drivers/video/rockchip/rga3/rga_hw_config.c @@ -175,12 +175,12 @@ const struct rga_win_data rga3_win_data[] = { { .name = "rga3-win0", - .raster_formats = rga3_input_raster_format, - .num_of_raster_formats = ARRAY_SIZE(rga3_input_raster_format), - .fbc_formats = rga3_fbcd_format, - .num_of_fbc_formats = ARRAY_SIZE(rga3_fbcd_format), - .tile_formats = rga3_tile_format, - .num_of_tile_formats = ARRAY_SIZE(rga3_tile_format), + .formats[RGA_RASTER_INDEX] = rga3_input_raster_format, + .formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga3_input_raster_format), + .formats[RGA_AFBC16x16_INDEX] = rga3_fbcd_format, + .formats_count[RGA_AFBC16x16_INDEX] = ARRAY_SIZE(rga3_fbcd_format), + .formats[RGA_TILE8x8_INDEX] = rga3_tile_format, + .formats_count[RGA_TILE8x8_INDEX] = ARRAY_SIZE(rga3_tile_format), .supported_rotations = RGA_MODE_ROTATE_MASK, .scale_up_mode = RGA_SCALE_UP_BIC, .scale_down_mode = RGA_SCALE_DOWN_AVG, @@ -190,12 +190,12 @@ { .name = "rga3-win1", - .raster_formats = rga3_input_raster_format, - .num_of_raster_formats = ARRAY_SIZE(rga3_input_raster_format), - .fbc_formats = rga3_fbcd_format, - .num_of_fbc_formats = ARRAY_SIZE(rga3_fbcd_format), - .tile_formats = rga3_tile_format, - .num_of_tile_formats = ARRAY_SIZE(rga3_tile_format), + .formats[RGA_RASTER_INDEX] = rga3_input_raster_format, + .formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga3_input_raster_format), + .formats[RGA_AFBC16x16_INDEX] = rga3_fbcd_format, + .formats_count[RGA_AFBC16x16_INDEX] = ARRAY_SIZE(rga3_fbcd_format), + .formats[RGA_TILE8x8_INDEX] = rga3_tile_format, + .formats_count[RGA_TILE8x8_INDEX] = ARRAY_SIZE(rga3_tile_format), .supported_rotations = RGA_MODE_ROTATE_MASK, .scale_up_mode = RGA_SCALE_UP_BIC, .scale_down_mode = RGA_SCALE_DOWN_AVG, @@ -205,12 +205,12 @@ { .name = "rga3-wr", - .raster_formats = rga3_output_raster_format, - .num_of_raster_formats = ARRAY_SIZE(rga3_output_raster_format), - .fbc_formats = rga3_fbcd_format, - .num_of_fbc_formats = ARRAY_SIZE(rga3_fbcd_format), - .tile_formats = rga3_tile_format, - .num_of_tile_formats = ARRAY_SIZE(rga3_tile_format), + .formats[RGA_RASTER_INDEX] = rga3_output_raster_format, + .formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga3_output_raster_format), + .formats[RGA_AFBC16x16_INDEX] = rga3_fbcd_format, + .formats_count[RGA_AFBC16x16_INDEX] = ARRAY_SIZE(rga3_fbcd_format), + .formats[RGA_TILE8x8_INDEX] = rga3_tile_format, + .formats_count[RGA_TILE8x8_INDEX] = ARRAY_SIZE(rga3_tile_format), .supported_rotations = 0, .scale_up_mode = RGA_SCALE_UP_NONE, .scale_down_mode = RGA_SCALE_DOWN_NONE, @@ -222,8 +222,8 @@ const struct rga_win_data rga2e_win_data[] = { { .name = "rga2e-src0", - .raster_formats = rga2e_input_raster_format, - .num_of_raster_formats = ARRAY_SIZE(rga2e_input_raster_format), + .formats[RGA_RASTER_INDEX] = rga2e_input_raster_format, + .formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga2e_input_raster_format), .supported_rotations = RGA_MODE_ROTATE_MASK, .scale_up_mode = RGA_SCALE_UP_BIC, .scale_down_mode = RGA_SCALE_DOWN_AVG, @@ -233,8 +233,8 @@ { .name = "rga2e-src1", - .raster_formats = rga2e_input_raster_format, - .num_of_raster_formats = ARRAY_SIZE(rga2e_input_raster_format), + .formats[RGA_RASTER_INDEX] = rga2e_input_raster_format, + .formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga2e_input_raster_format), .supported_rotations = RGA_MODE_ROTATE_MASK, .scale_up_mode = RGA_SCALE_UP_BIC, .scale_down_mode = RGA_SCALE_DOWN_AVG, @@ -244,8 +244,8 @@ { .name = "rga2-dst", - .raster_formats = rga2e_output_raster_format, - .num_of_raster_formats = ARRAY_SIZE(rga2e_output_raster_format), + .formats[RGA_RASTER_INDEX] = rga2e_output_raster_format, + .formats_count[RGA_RASTER_INDEX] = ARRAY_SIZE(rga2e_output_raster_format), .supported_rotations = 0, .scale_up_mode = RGA_SCALE_UP_NONE, .scale_down_mode = RGA_SCALE_DOWN_NONE, @@ -292,9 +292,8 @@ .feature = RGA_COLOR_FILL | RGA_COLOR_PALETTE | RGA_COLOR_KEY | RGA_ROP_CALCULATE | - RGA_NN_QUANTIZE | RGA_DITHER, - .csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F | - RGA_MODE_CSC_BT709, + RGA_NN_QUANTIZE | RGA_DITHER | RGA_FULL_CSC, + .csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F, .csc_y2r_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F | RGA_MODE_CSC_BT709, .mmu = RGA_MMU, @@ -318,7 +317,7 @@ RGA_COLOR_KEY | RGA_ROP_CALCULATE | RGA_NN_QUANTIZE | RGA_DITHER | RGA_MOSAIC | RGA_YIN_YOUT | RGA_YUV_HDS | RGA_YUV_VDS | - RGA_OSD | RGA_PRE_INTR, + RGA_OSD | RGA_PRE_INTR | RGA_FULL_CSC, .csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F | RGA_MODE_CSC_BT709, .csc_y2r_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F | @@ -344,7 +343,7 @@ RGA_COLOR_KEY | RGA_ROP_CALCULATE | RGA_NN_QUANTIZE | RGA_DITHER | RGA_MOSAIC | RGA_YIN_YOUT | RGA_YUV_HDS | RGA_YUV_VDS | - RGA_OSD | RGA_PRE_INTR, + RGA_OSD | RGA_PRE_INTR | RGA_FULL_CSC, .csc_r2y_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F | RGA_MODE_CSC_BT709, .csc_y2r_mode = RGA_MODE_CSC_BT601L | RGA_MODE_CSC_BT601F | -- Gitblit v1.6.2