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

drm/rockchip: rk3399 vop: fix cabc register define error

Browse Source 
Change-Id: Iecb47dc3b46562831a35a84bb72aff701b407be3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2018-01-25 15:53:07 +08:00
committed by Tao Huang
parent bdfbea97b4
commit 37e83ddf43
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2966,7 +2966,7 @@ static void vop_update_cabc(struct drm_crtc *crtc,
VOP_CTRL_SET(vop, cabc_stage_down, s->cabc_stage_down);
VOP_CTRL_SET(vop, cabc_global_dn, s->cabc_global_dn);
VOP_CTRL_SET(vop, cabc_calc_pixel_num,
s->cabc_calc_pixel_num * pixel_total / 1000);
pixel_total / 1000 * s->cabc_calc_pixel_num);
} else {
/*
* There are some hardware issues on cabc disabling:

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

@@ -240,10 +240,10 @@ static const struct vop_ctrl rk3288_ctrl_data = {
0, 3, 5, -1),
.afbdc_pic_size = VOP_REG_VER(RK3399_AFBCD0_PIC_SIZE, 0xffffffff,
0, 3, 5, -1),
.cabc_config_mode = VOP_REG_VER(RK3399_CABC_CTRL0, 0x3, 1, 3, 5, -1),
.cabc_config_mode = VOP_REG_VER(RK3399_CABC_CTRL0, 0x3, 2, 3, 5, -1),
.cabc_calc_pixel_num = VOP_REG_VER(RK3399_CABC_CTRL0, 0x7fffff, 4,
3, 5, -1),
.cabc_handle_en = VOP_REG_VER(RK3399_CABC_CTRL0, 0x1, 3, 3, 5, -1),
.cabc_handle_en = VOP_REG_VER(RK3399_CABC_CTRL0, 0x1, 1, 3, 5, -1),
.cabc_en = VOP_REG_VER(RK3399_CABC_CTRL0, 0x1, 0, 3, 5, -1),
.cabc_total_num = VOP_REG_VER(RK3399_CABC_CTRL1, 0x7fffff, 4, 3, 5, -1),
.cabc_lut_en = VOP_REG_VER(RK3399_CABC_CTRL1, 0x1, 0, 3, 5, -1),