From 89b7ad3a8edbb8b863965c73532839401d7b250d Mon Sep 17 00:00:00 2001 From: WeiYong Bi Date: Mon, 7 Aug 2017 17:55:06 +0800 Subject: [PATCH] drm/rockchip: dsi: partial revert commit 47aef8 fix anomaly display issue for rk3368 caused by commit 47aef8 Fixes 47aef8 (drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_set_mode function) Change-Id: Ida274c65898b13468a2f984555efdf67cf32aab7 Signed-off-by: WeiYong Bi --- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c index ffe4f0a52323..0951a88c9325 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c @@ -832,10 +832,14 @@ static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi) static void dw_mipi_dsi_set_mode(struct dw_mipi_dsi *dsi, enum dw_mipi_dsi_mode mode) { - if (mode == DSI_COMMAND_MODE) + if (mode == DSI_COMMAND_MODE) { dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE); - else + } else { + dsi_write(dsi, DSI_PWR_UP, RESET); + dsi_write(dsi, DSI_LPCLK_CTRL, PHY_TXREQUESTCLKHS); dsi_write(dsi, DSI_MODE_CFG, ENABLE_VIDEO_MODE); + dsi_write(dsi, DSI_PWR_UP, POWERUP); + } } static void dw_mipi_dsi_init(struct dw_mipi_dsi *dsi) @@ -1161,7 +1165,6 @@ static void rockchip_dsi_init(struct dw_mipi_dsi *dsi) static void rockchip_dsi_enable(struct dw_mipi_dsi *dsi) { - dsi_write(dsi, DSI_LPCLK_CTRL, PHY_TXREQUESTCLKHS); dw_mipi_dsi_set_mode(dsi, DSI_VIDEO_MODE); clk_disable_unprepare(dsi->dphy.ref_clk); clk_disable_unprepare(dsi->pclk); -- 2.34.1