From: Mark Yao Date: Tue, 6 Sep 2016 09:28:32 +0000 (+0800) Subject: drm/rockchip: vop: fix rk3036 no display X-Git-Tag: firefly_0821_release~1534 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9cb1ed8edf2e297ad592de59148906debec91dc6;p=firefly-linux-kernel-4.4.55.git drm/rockchip: vop: fix rk3036 no display Rk3036 vop default is blank, so init vop with unblank. Change-Id: I10c21af70cec95b7073f8c999e655031ee154747 Signed-off-by: Mark Yao --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index e5c95bdb38ea..194edcd290c6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -553,6 +553,7 @@ static void vop_enable(struct drm_crtc *crtc) memcpy(vop->regsbak, vop->regs, vop->len); VOP_CTRL_SET(vop, global_regdone_en, 1); + VOP_CTRL_SET(vop, dsp_blank, 0); for (i = 0; i < vop->num_wins; i++) { struct vop_win *win = &vop->win[i]; diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 8e27991a2ffb..4298e091350f 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -474,6 +474,7 @@ static const struct vop_intr rk3036_intr = { static const struct vop_ctrl rk3036_ctrl_data = { .standby = VOP_REG(RK3036_SYS_CTRL, 0x1, 30), .out_mode = VOP_REG(RK3036_DSP_CTRL0, 0xf, 0), + .dsp_blank = VOP_REG(RK3036_DSP_CTRL1, 0x1, 24), .pin_pol = VOP_REG(RK3036_DSP_CTRL0, 0xf, 4), .dsp_layer_sel = VOP_REG(RK3036_DSP_CTRL0, 0x1, 8), .htotal_pw = VOP_REG(RK3036_DSP_HTOTAL_HS_END, 0x1fff1fff, 0),