qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/rockchip: vop: rk312x use win1 to show logo 

since kernel set rk312x win1 to show kernel logo, so here sync with
kernel config.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I3ed562526cd6f61359bef1567c7f2ea57149435d
This commit is contained in:
Sandy Huang 2020-06-12 11:43:54 +08:00 committed by Jianhong Chen
parent 695a88c4e9
commit 48efbc7eef
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/video/drm/rockchip_vop_reg.c
View File

@ -416,27 +416,14 @@ const struct vop_data rk3328_vop = {
.reg_len = RK3328_DSP_VACT_ST_END_F1 * 4, .reg_len = RK3328_DSP_VACT_ST_END_F1 * 4,
}; };
static const struct vop_scl_regs rk3036_win_scl = { static const struct vop_win rk3126_win1_data = {
.scale_yrgb_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0), .enable = VOP_REG(RK3036_SYS_CTRL, 0x1, 1),
.scale_yrgb_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 16), .format = VOP_REG(RK3036_SYS_CTRL, 0x7, 6),
.scale_cbcr_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_CBR, 0xffff, 0x0), .rb_swap = VOP_REG(RK3036_SYS_CTRL, 0x1, 19),
.scale_cbcr_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_CBR, 0xffff, 16), .dsp_info = VOP_REG(RK3126_WIN1_DSP_INFO, 0x0fff0fff, 0),
}; .dsp_st = VOP_REG(RK3126_WIN1_DSP_ST, 0x1fff1fff, 0),
.yrgb_mst = VOP_REG(RK3126_WIN1_MST, 0xffffffff, 0),
static const struct vop_win rk3036_win0_data = { .yrgb_vir = VOP_REG(RK3036_WIN1_VIR, 0xffff, 0),
.scl = &rk3036_win_scl,
.enable = VOP_REG(RK3036_SYS_CTRL, 0x1, 0),
.format = VOP_REG(RK3036_SYS_CTRL, 0x7, 3),
.rb_swap = VOP_REG(RK3036_SYS_CTRL, 0x1, 15),
.act_info = VOP_REG(RK3036_WIN0_ACT_INFO, 0x1fff1fff, 0),
.dsp_info = VOP_REG(RK3036_WIN0_DSP_INFO, 0x0fff0fff, 0),
.dsp_st = VOP_REG(RK3036_WIN0_DSP_ST, 0x1fff1fff, 0),
.yrgb_mst = VOP_REG(RK3036_WIN0_YRGB_MST, 0xffffffff, 0),
.uv_mst = VOP_REG(RK3036_WIN0_CBR_MST, 0xffffffff, 0),
.yrgb_vir = VOP_REG(RK3036_WIN0_VIR, 0xffff, 0),
.uv_vir = VOP_REG(RK3036_WIN0_VIR, 0x1fff, 16),
.alpha_mode = VOP_REG(RK3036_DSP_CTRL0, 0x1, 18),
.alpha_en = VOP_REG(RK3036_ALPHA_CTRL, 0x1, 0)
}; };
static const struct vop_ctrl rk3036_ctrl_data = { static const struct vop_ctrl rk3036_ctrl_data = {
@ -471,7 +458,7 @@ const struct vop_data rk3036_vop = {
.version = VOP_VERSION(2, 2), .version = VOP_VERSION(2, 2),
.max_output = {1920, 1080}, .max_output = {1920, 1080},
.ctrl = &rk3036_ctrl_data, .ctrl = &rk3036_ctrl_data,
.win = &rk3036_win0_data, .win = &rk3126_win1_data,
.line_flag = &rk3036_vop_line_flag, .line_flag = &rk3036_vop_line_flag,
.reg_len = RK3036_DSP_VACT_ST_END_F1 * 4, .reg_len = RK3036_DSP_VACT_ST_END_F1 * 4,
}; };

6
drivers/video/drm/rockchip_vop_reg.h
View File

@ -876,6 +876,12 @@
#define RK3036_HWC_LUT_ADDR 0x800 #define RK3036_HWC_LUT_ADDR 0x800
/* rk3036 register definition end */ /* rk3036 register definition end */
/* rk3126 register definition */
#define RK3126_WIN1_MST 0x0004c
#define RK3126_WIN1_DSP_INFO 0x00050
#define RK3126_WIN1_DSP_ST 0x00054
/* rk3126 register definition end */
/* rk3366 register definition */ /* rk3366 register definition */
#define RK3366_LIT_REG_CFG_DONE 0x00000 #define RK3366_LIT_REG_CFG_DONE 0x00000
#define RK3366_LIT_VERSION 0x00004 #define RK3366_LIT_VERSION 0x00004