From 76c173d8feabe02c2d4aa3e4c10207d7903e0028 Mon Sep 17 00:00:00 2001 From: Li Huang Date: Tue, 30 Nov 2021 21:39:29 +0800 Subject: [PATCH] video: rockchip: rga3: Add some missing format Signed-off-by: Li Huang Change-Id: Ia8b7f81389917b821993ea655323b3c625b2a5d3 --- drivers/video/rockchip/rga3/rga3_reg_info.c | 20 ++++++++++++++++++++ drivers/video/rockchip/rga3/rga_hw_config.c | 18 ++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/rga3/rga3_reg_info.c b/drivers/video/rockchip/rga3/rga3_reg_info.c index 24288908d7ee..957d05301ccc 100644 --- a/drivers/video/rockchip/rga3/rga3_reg_info.c +++ b/drivers/video/rockchip/rga3/rga3_reg_info.c @@ -188,6 +188,16 @@ static void RGA3_set_reg_win0_info(u8 *base, struct rga3_req *msg) pixel_width = 4; win_interleaved = 2; break; + case RGA2_FORMAT_ARGB_8888: + win_format = 0x7; + pixel_width = 4; + win_interleaved = 2; + break; + case RGA2_FORMAT_ABGR_8888: + win_format = 0x9; + pixel_width = 4; + win_interleaved = 2; + break; case RGA2_FORMAT_RGB_888: win_format = 0x5; pixel_width = 3; @@ -584,6 +594,16 @@ static void RGA3_set_reg_win1_info(u8 *base, struct rga3_req *msg) pixel_width = 4; win_interleaved = 2; break; + case RGA2_FORMAT_ARGB_8888: + win_format = 0x7; + pixel_width = 4; + win_interleaved = 2; + break; + case RGA2_FORMAT_ABGR_8888: + win_format = 0x9; + pixel_width = 4; + win_interleaved = 2; + break; case RGA2_FORMAT_RGB_888: win_format = 0x5; pixel_width = 3; diff --git a/drivers/video/rockchip/rga3/rga_hw_config.c b/drivers/video/rockchip/rga3/rga_hw_config.c index 232476e5f0b4..794127c4bab4 100644 --- a/drivers/video/rockchip/rga3/rga_hw_config.c +++ b/drivers/video/rockchip/rga3/rga_hw_config.c @@ -10,9 +10,7 @@ const uint32_t rga3_raster_format[] = { RGA2_FORMAT_RGBA_8888, - RGA2_FORMAT_RGBX_8888, RGA2_FORMAT_BGRA_8888, - RGA2_FORMAT_BGRX_8888, RGA2_FORMAT_RGB_888, RGA2_FORMAT_BGR_888, RGA2_FORMAT_RGB_565, @@ -33,9 +31,7 @@ const uint32_t rga3_raster_format[] = { const uint32_t rga3_fbcd_format[] = { RGA2_FORMAT_RGBA_8888, - RGA2_FORMAT_RGBX_8888, RGA2_FORMAT_BGRA_8888, - RGA2_FORMAT_BGRX_8888, RGA2_FORMAT_RGB_888, RGA2_FORMAT_BGR_888, RGA2_FORMAT_RGB_565, @@ -70,6 +66,10 @@ const uint32_t rga2e_raster_format[] = { RGA2_FORMAT_BGR_888, RGA2_FORMAT_RGB_565, RGA2_FORMAT_BGR_565, + RGA2_FORMAT_YCbCr_422_P, + RGA2_FORMAT_YCbCr_420_P, + RGA2_FORMAT_YCrCb_422_P, + RGA2_FORMAT_YCrCb_420_P, RGA2_FORMAT_YCbCr_422_SP, RGA2_FORMAT_YCbCr_420_SP, RGA2_FORMAT_YCrCb_422_SP, @@ -90,6 +90,16 @@ const uint32_t rga2e_raster_format[] = { RGA2_FORMAT_BGRA_4444, RGA2_FORMAT_XRGB_8888, RGA2_FORMAT_XBGR_8888, + RGA2_FORMAT_BPP_1, + RGA2_FORMAT_BPP_2, + RGA2_FORMAT_BPP_4, + RGA2_FORMAT_BPP_8, + RGA2_FORMAT_ARGB_8888, + RGA2_FORMAT_ARGB_5551, + RGA2_FORMAT_ARGB_4444, + RGA2_FORMAT_ABGR_8888, + RGA2_FORMAT_ABGR_5551, + RGA2_FORMAT_ABGR_4444, }; const struct rga_win_data rga3_win_data[] = {