diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 7e8640bbf605..6d3bf55c4351 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -3111,6 +3111,7 @@ static void vop_cfg_update(struct drm_crtc *crtc, VOP_CTRL_SET(vop, afbdc_en, s->afbdc_en); VOP_CTRL_SET(vop, dsp_layer_sel, s->dsp_layer_sel); + VOP_CTRL_SET(vop, win2_zpos, 2); vop_post_config(crtc); spin_unlock(&vop->reg_lock); diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index dd708d5c3089..ae9f316c6e6d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -228,6 +228,7 @@ struct vop_ctrl { struct vop_reg st2084oetf_post_conv_en; struct vop_reg win_csc_mode_sel; + struct vop_reg win2_zpos; struct vop_reg reg_done_frm; struct vop_reg cfg_done; }; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 14025bfe6eeb..d2aca90320a7 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -1416,7 +1416,7 @@ static const struct vop_ctrl px30_ctrl_data = { .dsp_interlace = VOP_REG(RK3366_LIT_DSP_CTRL2, 0x1, 0), .global_regdone_en = VOP_REG(RK3366_LIT_SYS_CTRL2, 0x1, 13), .auto_gate_en = VOP_REG(RK3366_LIT_SYS_CTRL2, 0x1, 0), - .dsp_layer_sel = VOP_REG(RK3366_LIT_DSP_CTRL2, 0xff, 22), + .dsp_layer_sel = VOP_REG(RK3366_LIT_DSP_CTRL2, 0xf, 22), .overlay_mode = VOP_REG(RK3366_LIT_DSP_CTRL2, 0x1, 4), .core_dclk_div = VOP_REG(RK3366_LIT_DSP_CTRL0, 0x1, 13), .dclk_ddr = VOP_REG(RK3366_LIT_DSP_CTRL0, 0x1, 14), @@ -1476,6 +1476,7 @@ static const struct vop_ctrl px30_ctrl_data = { .cabc_stage_down = VOP_REG(PX30_CABC_CTRL2, 0xff, 0), .cabc_global_dn = VOP_REG(PX30_CABC_CTRL3, 0xff, 0), .cabc_global_dn_limit_en = VOP_REG(PX30_CABC_CTRL3, 0x1, 8), + .win2_zpos = VOP_REG(RK3366_LIT_DSP_CTRL2, 0x3, 26), }; static const struct vop_win_phy px30_win23_data = {