shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

drm/rockchip: vop: Fix bcsh_out_mode register field definitions

Browse Source 
Change-Id: I5436d748be938ee5795ce7b3fd49f582fad58bdf
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi
2018-03-20 16:45:55 +08:00
committed by Tao Huang
parent cd028dbdac
commit 6ee21b2eae
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@@ -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);
}

7
drivers/gpu/drm/rockchip/rockchip_drm_vop.h
View File

@@ -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,

2
drivers/gpu/drm/rockchip/rockchip_vop_reg.c
View File

@@ -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),