shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

video: rockchip: rga3: Fix OSD configuration

Browse Source 
1. Fixup fix_width will only be less than 128(0x3f).
2. Add support RGBA2BPP.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I8af80a6ca6e26a0b1e2f023427108739fdf27dfa
This commit is contained in:
Yu Qiaowei
2022-03-24 17:59:32 +08:00
committed by Tao Huang
parent 66a65ee99d
commit 7db276831b
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/rockchip/rga3/include/rga2_reg_info.h
View File

@@ -165,8 +165,8 @@
#define s_RGA2_OSD_CTRL0_SW_OSD_VER_MODE(x) ((x & 0x1) << 2)
#define s_RGA2_OSD_CTRL0_SW_OSD_WIDTH_MODE(x) ((x & 0x1) << 3)
#define s_RGA2_OSD_CTRL0_SW_OSD_BLK_NUM(x) ((x & 0x1f) << 4)
#define s_RGA2_OSD_CTRL0_SW_OSD_FLAGS_INDEX(x) ((x & 0x3f) << 10)
#define s_RGA2_OSD_CTRL0_SW_OSD_FIX_WIDTH(x) ((x & 0x3f) << 20)
#define s_RGA2_OSD_CTRL0_SW_OSD_FLAGS_INDEX(x) ((x & 0x3ff) << 10)
#define s_RGA2_OSD_CTRL0_SW_OSD_FIX_WIDTH(x) ((x & 0x3ff) << 20)
#define s_RGA2_OSD_CTRL0_SW_OSD_2BPP_MODE(x) ((x & 0x1) << 30)
/* RGA2_OSD_CTRL1 */

10
drivers/video/rockchip/rga3/rga2_reg_info.c
View File

@@ -1450,6 +1450,9 @@ static void RGA2_set_reg_osd(u8 *base, struct rga2_req *msg)
/* The register is '0' as the first. */
block_num = msg->osd_info.mode_ctrl.block_num - 1;
if (msg->src1.format == RGA_FORMAT_RGBA_2BPP)
rgba2bpp_en = 1;
reg = 0;
reg = ((reg & (~m_RGA2_OSD_CTRL0_SW_OSD_MODE)) |
(s_RGA2_OSD_CTRL0_SW_OSD_MODE(msg->osd_info.mode_ctrl.mode)));
@@ -1986,6 +1989,13 @@ static void rga_cmd_to_rga2_cmd(struct rga_scheduler_t *scheduler,
default:
break;
}
if (req->osd_info.enable) {
/* set dst(osd_block) real color mode */
if (req->alpha_mode_0 & (0x01 << 9))
req->alpha_mode_0 |= (1 << 15);
}
/* Real color mode */
if ((req_rga->alpha_rop_flag >> 9) & 1) {
if (req->alpha_mode_0 & (0x01 << 1))

4
drivers/video/rockchip/rga3/rga_common.c
View File

@@ -338,6 +338,10 @@ const char *rga_get_format_name(uint32_t format)
return "ABGR5551";
case RGA_FORMAT_ABGR_4444:
return "ABGR4444";
case RGA_FORMAT_RGBA_2BPP:
return "RGBA2BPP";
default:
return "UNF";
}