From f534c950b81f1ab56032cafbcf44b97f58cf117c Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Mon, 26 Nov 2018 20:31:57 +0800 Subject: [PATCH] drm/rockchip: vop: add rk312x vop premultiplied alpha config Change-Id: I444a7c36731da8984e23368dc11e5af8221b0da8 Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 939e7bd63bcc..264ed8bb2b91 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -1086,7 +1086,8 @@ static const struct vop_win_phy rk3036_win0_data = { .yrgb_vir = VOP_REG(RK3036_WIN0_VIR, 0xffff, 0), .uv_vir = VOP_REG(RK3036_WIN0_VIR, 0x1fff, 16), .alpha_mode = VOP_REG(RK3036_DSP_CTRL0, 0x1, 18), - .alpha_en = VOP_REG(RK3036_ALPHA_CTRL, 0x1, 0) + .alpha_en = VOP_REG(RK3036_ALPHA_CTRL, 0x1, 0), + .alpha_pre_mul = VOP_REG(RK3036_DSP_CTRL0, 0x1, 29), }; static const struct vop_win_phy rk3036_win1_data = { @@ -1421,7 +1422,8 @@ static const struct vop_win_phy rk3126_win1_data = { .yrgb_mst = VOP_REG(RK3126_WIN1_MST, 0xffffffff, 0), .yrgb_vir = VOP_REG(RK3036_WIN1_VIR, 0xffff, 0), .alpha_mode = VOP_REG(RK3036_DSP_CTRL0, 0x1, 19), - .alpha_en = VOP_REG(RK3036_ALPHA_CTRL, 0x1, 1) + .alpha_en = VOP_REG(RK3036_ALPHA_CTRL, 0x1, 1), + .alpha_pre_mul = VOP_REG(RK3036_DSP_CTRL0, 0x1, 29), }; static const struct vop_win_data rk3126_vop_win_data[] = {