Revert "drm/rockchip: vop: Make sure all unused outputs are disabled"

This reverts commit 9890fbb.

Change-Id: I37e55d833b6b7b922bca2356c4bf6dd19a1c202a
Signed-off-by: Wyon Bi <[email protected]>

Author: bivvy

drivers/gpu/drm/rockchip/rockchip_drm_vop.c

@@ -924,17 +924,6 @@ static int to_vop_csc_mode(int csc_mode)
 	}
 }
 
-static void vop_disable_all_outputs(struct vop *vop)
-{
-	VOP_CTRL_SET(vop, rgb_en, 0);
-	VOP_CTRL_SET(vop, lvds_en, 0);
-	VOP_CTRL_SET(vop, edp_en, 0);
-	VOP_CTRL_SET(vop, hdmi_en, 0);
-	VOP_CTRL_SET(vop, mipi_en, 0);
-	VOP_CTRL_SET(vop, dp_en, 0);
-	VOP_CTRL_SET(vop, tve_dclk_en, 0);
-}
-
 static void vop_disable_all_planes(struct vop *vop)
 {
 	bool active;
@@ -1403,7 +1392,6 @@ static void vop_crtc_disable(struct drm_crtc *crtc)
 				SYS_STATUS_LCDC1 : SYS_STATUS_LCDC0;
 
 	vop_lock(vop);
-	vop_disable_all_outputs(vop);
 	VOP_CTRL_SET(vop, reg_done_frm, 1);
 	VOP_CTRL_SET(vop, dsp_interlace, 0);
 	drm_crtc_vblank_off(crtc);
@@ -2727,7 +2715,6 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
 		     hdisplay, vdisplay, interlaced ? "i" : "p",
 		     adjusted_mode->vrefresh, s->output_type);
 	vop_initial(crtc);
-	vop_disable_all_outputs(vop);
 	vop_disable_allwin(vop);
 	VOP_CTRL_SET(vop, standby, 0);
 	vop->mode_update = vop_crtc_mode_update(crtc);
@@ -2755,13 +2742,10 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
 
 	switch (s->output_type) {
 	case DRM_MODE_CONNECTOR_DPI:
+	case DRM_MODE_CONNECTOR_LVDS:
 		VOP_CTRL_SET(vop, rgb_en, 1);
 		VOP_CTRL_SET(vop, rgb_pin_pol, val);
 		VOP_CTRL_SET(vop, rgb_dclk_pol, dclk_inv);
-
-		VOP_GRF_SET(vop, grf_dclk_inv, !dclk_inv);
-		break;
-	case DRM_MODE_CONNECTOR_LVDS:
 		VOP_CTRL_SET(vop, lvds_en, 1);
 		VOP_CTRL_SET(vop, lvds_pin_pol, val);
 		VOP_CTRL_SET(vop, lvds_dclk_pol, dclk_inv);

drivers/gpu/drm/rockchip/rockchip_vop_reg.c

@@ -211,7 +211,6 @@ static const struct vop_ctrl rk3288_ctrl_data = {
 	.dp_en = VOP_REG_VER(RK3399_SYS_CTRL, 0x1, 11, 3, 5, -1),
 	.hdmi_dclk_out_en = VOP_REG_VER(RK3288_SYS_CTRL, 0x1, 11, 3, 1, 1),
 	.rgb_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 12),
-	.lvds_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 12),
 	.hdmi_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 13),
 	.edp_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 14),
 	.mipi_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 15),
@@ -223,8 +222,6 @@ static const struct vop_ctrl rk3288_ctrl_data = {
 	.dp_pin_pol = VOP_REG_VER(RK3399_DSP_CTRL1, 0x7, 16, 3, 5, -1),
 	.rgb_dclk_pol = VOP_REG_VER(RK3368_DSP_CTRL1, 0x1, 19, 3, 2, -1),
 	.rgb_pin_pol = VOP_REG_VER(RK3368_DSP_CTRL1, 0x7, 16, 3, 2, -1),
-	.lvds_dclk_pol = VOP_REG_VER(RK3368_DSP_CTRL1, 0x1, 19, 3, 2, -1),
-	.lvds_pin_pol = VOP_REG_VER(RK3368_DSP_CTRL1, 0x7, 16, 3, 2, -1),
 	.tve_dclk_en = VOP_REG(RK3288_SYS_CTRL, 0x1, 24),
 	.tve_dclk_pol = VOP_REG(RK3288_SYS_CTRL, 0x1, 25),
 	.tve_sw_mode = VOP_REG(RK3288_SYS_CTRL, 0x1, 26),