Skip to content

Commit adce2f1

Browse files
committed
drm/rockchip: rk3036 vop: add support win1 scale config
Change-Id: I3c76a63fc47f68c10128727f7eb6b8bcbf498323 Signed-off-by: Sandy Huang <hjc@rock-chips.com>
1 parent c1df7de commit adce2f1

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

drivers/gpu/drm/rockchip/rockchip_vop_reg.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,15 +1010,20 @@ static const struct vop_data rk3328_vop = {
10101010
.win_size = ARRAY_SIZE(rk3328_vop_win_data),
10111011
};
10121012

1013-
static const struct vop_scl_regs rk3036_win_scl = {
1013+
static const struct vop_scl_regs rk3036_win0_scl = {
10141014
.scale_yrgb_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0),
10151015
.scale_yrgb_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 16),
10161016
.scale_cbcr_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_CBR, 0xffff, 0x0),
10171017
.scale_cbcr_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_CBR, 0xffff, 16),
10181018
};
10191019

1020+
static const struct vop_scl_regs rk3036_win1_scl = {
1021+
.scale_yrgb_x = VOP_REG(RK3036_WIN1_SCL_FACTOR_YRGB, 0xffff, 0x0),
1022+
.scale_yrgb_y = VOP_REG(RK3036_WIN1_SCL_FACTOR_YRGB, 0xffff, 16),
1023+
};
1024+
10201025
static const struct vop_win_phy rk3036_win0_data = {
1021-
.scl = &rk3036_win_scl,
1026+
.scl = &rk3036_win0_scl,
10221027
.data_formats = formats_win_full,
10231028
.nformats = ARRAY_SIZE(formats_win_full),
10241029
.enable = VOP_REG(RK3036_SYS_CTRL, 0x1, 0),
@@ -1036,6 +1041,7 @@ static const struct vop_win_phy rk3036_win0_data = {
10361041
};
10371042

10381043
static const struct vop_win_phy rk3036_win1_data = {
1044+
.scl = &rk3036_win1_scl,
10391045
.data_formats = formats_win_lite,
10401046
.nformats = ARRAY_SIZE(formats_win_lite),
10411047
.enable = VOP_REG(RK3036_SYS_CTRL, 0x1, 1),

0 commit comments

Comments
 (0)