From 6ee21b2eae5a0bf8d32b0e159fe885e10d56897a Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Tue, 20 Mar 2018 16:45:55 +0800 Subject: [PATCH] drm/rockchip: vop: Fix bcsh_out_mode register field definitions Change-Id: I5436d748be938ee5795ce7b3fd49f582fad58bdf Signed-off-by: Wyon Bi --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 +++++++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index b9eb1c14f984..898e85f8552f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -3094,6 +3094,7 @@ static void vop_tv_config_update(struct drm_crtc *crtc, VOP_CTRL_SET(vop, bcsh_sat_con, saturation * contrast / 0x100); VOP_CTRL_SET(vop, bcsh_sin_hue, sin_hue); VOP_CTRL_SET(vop, bcsh_cos_hue, cos_hue); + VOP_CTRL_SET(vop, bcsh_out_mode, BCSH_OUT_MODE_NORMAL_VIDEO); VOP_CTRL_SET(vop, bcsh_en, s->bcsh_en); } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 3d1a760cffaa..b88ca8f39825 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -30,6 +30,13 @@ #define AFBDC_FMT_U8U8U8U8 0x5 #define AFBDC_FMT_U8U8U8 0x4 +enum bcsh_out_mode { + BCSH_OUT_MODE_BLACK, + BCSH_OUT_MODE_BLUE, + BCSH_OUT_MODE_COLOR_BAR, + BCSH_OUT_MODE_NORMAL_VIDEO, +}; + enum cabc_stage_mode { LAST_FRAME_PWM_VAL = 0x0, CUR_FRAME_PWM_VAL = 0x1, diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index bf1548a49ddc..58cb19714b02 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -262,7 +262,7 @@ static const struct vop_ctrl rk3288_ctrl_data = { .bcsh_brightness = VOP_REG(RK3288_BCSH_BCS, 0xff, 0), .bcsh_contrast = VOP_REG(RK3288_BCSH_BCS, 0x1ff, 8), .bcsh_sat_con = VOP_REG(RK3288_BCSH_BCS, 0x3ff, 20), - .bcsh_out_mode = VOP_REG(RK3288_BCSH_BCS, 0x3, 0), + .bcsh_out_mode = VOP_REG(RK3288_BCSH_BCS, 0x3, 30), .bcsh_sin_hue = VOP_REG(RK3288_BCSH_H, 0x1ff, 0), .bcsh_cos_hue = VOP_REG(RK3288_BCSH_H, 0x1ff, 16), .bcsh_r2y_csc_mode = VOP_REG_VER(RK3368_BCSH_CTRL, 0x1, 6, 3, 1, -1),