diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 7661bf3e155d..2c51381ba047 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -570,6 +570,7 @@ struct vop2_video_port_regs { struct vop_reg sdr2hdr_oetf_en; struct vop_reg sdr2hdr_bypass_en; struct vop_reg sdr2hdr_auto_gating_en; + struct vop_reg sdr2hdr_path_en; struct vop_reg hdr2sdr_en; struct vop_reg hdr2sdr_bypass_en; struct vop_reg hdr2sdr_auto_gating_en; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 0f2f8713d4e1..d05bd9803786 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -4160,6 +4160,7 @@ static void vop2_setup_hdr10(struct vop2_video_port *vp, uint8_t win_phys_id) vop2_load_sdr2hdr_table(vp, sdr2hdr_tf); VOP_MODULE_SET(vop2, vp, sdr2hdr_r2r_mode, sdr2hdr_r2r_mode); } + VOP_MODULE_SET(vop2, vp, sdr2hdr_path_en, sdr2hdr_en); VOP_MODULE_SET(vop2, vp, sdr2hdr_oetf_en, sdr2hdr_en); VOP_MODULE_SET(vop2, vp, sdr2hdr_eotf_en, sdr2hdr_en); VOP_MODULE_SET(vop2, vp, sdr2hdr_r2r_en, sdr2hdr_en); diff --git a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c index c1f1c78a1314..bb68b3597a6d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop2_reg.c @@ -471,6 +471,7 @@ static const struct vop2_video_port_regs rk3568_vop_vp0_regs = { .sdr2hdr_oetf_en = VOP_REG(RK3568_SDR2HDR_CTRL, 0x1, 3), .sdr2hdr_bypass_en = VOP_REG(RK3568_SDR2HDR_CTRL, 0x1, 8), .sdr2hdr_auto_gating_en = VOP_REG(RK3568_SDR2HDR_CTRL, 0x1, 9), + .sdr2hdr_path_en = VOP_REG(RK3568_OVL_CTRL, 0x1, 5), .hdr2sdr_en = VOP_REG(RK3568_HDR2SDR_CTRL, 0x1, 0), .hdr2sdr_bypass_en = VOP_REG(RK3568_HDR2SDR_CTRL, 0x1, 8), .hdr2sdr_auto_gating_en = VOP_REG(RK3568_HDR2SDR_CTRL, 0x1, 9),