From 28fb9688e83a4e05952a7623bf51274e23ee720f Mon Sep 17 00:00:00 2001 From: Sandy Huang Date: Tue, 4 Jun 2019 10:30:42 +0800 Subject: [PATCH] drm/rockchip: set rgb overlay mode as default config Change-Id: I8e1aafe5375862c34fa73aff16565a81bd12145d Signed-off-by: Sandy Huang --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 + 3 files changed, 3 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index f8c5d47db658..a2e104079b02 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -1008,6 +1008,7 @@ static void vop_crtc_atomic_enable(struct drm_crtc *crtc, VOP_REG_SET(vop, common, pre_dither_down, 0); VOP_REG_SET(vop, common, out_mode, s->output_mode); + VOP_REG_SET(vop, common, yuv_overlay, 0); VOP_REG_SET(vop, modeset, htotal_pw, (htotal << 16) | hsync_len); val = hact_st << 16; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 2cfbe780276e..ccea7b192e08 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -76,6 +76,7 @@ struct vop_common { struct vop_reg mmu_en; struct vop_reg out_mode; struct vop_reg standby; + struct vop_reg yuv_overlay; }; struct vop_misc { diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index bd029a52f9f5..b8ecab510f9c 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -535,6 +535,7 @@ static const struct vop_misc rk3328_misc = { static const struct vop_common rk3328_common = { .standby = VOP_REG_SYNC(RK3328_SYS_CTRL, 0x1, 22), + .yuv_overlay = VOP_REG_SYNC(RK3328_SYS_CTRL, 0x1, 16), .dither_down = VOP_REG(RK3328_DSP_CTRL1, 0xf, 1), .dither_up = VOP_REG(RK3328_DSP_CTRL1, 0x1, 6), .dsp_blank = VOP_REG(RK3328_DSP_CTRL0, 0x3, 18),