Skip to content

Commit 47aef81

Browse files
xubilvrkhuangtao
authored andcommitted
drm/rockchip: dw-mipi-dsi: organize dw_mipi_dsi_set_mode function
Change-Id: I4ba2a1519c1e5ac485a4d7416c0066ad8ce6527a Signed-off-by: xubilv <xbl@rock-chips.com>
1 parent 83ae132 commit 47aef81

1 file changed

Lines changed: 7 additions & 13 deletions

File tree

drivers/gpu/drm/rockchip/dw-mipi-dsi.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ struct dw_mipi_dsi {
319319
};
320320

321321
enum dw_mipi_dsi_mode {
322-
DW_MIPI_DSI_CMD_MODE,
323-
DW_MIPI_DSI_VID_MODE,
322+
DSI_COMMAND_MODE,
323+
DSI_VIDEO_MODE,
324324
};
325325

326326
struct dphy_pll_testdin_map {
@@ -707,16 +707,10 @@ static void dw_mipi_dsi_video_mode_config(struct dw_mipi_dsi *dsi)
707707
static void dw_mipi_dsi_set_mode(struct dw_mipi_dsi *dsi,
708708
enum dw_mipi_dsi_mode mode)
709709
{
710-
if (mode == DW_MIPI_DSI_CMD_MODE) {
711-
dsi_write(dsi, DSI_PWR_UP, RESET);
710+
if (mode == DSI_COMMAND_MODE)
712711
dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE);
713-
dsi_write(dsi, DSI_PWR_UP, POWERUP);
714-
} else {
715-
dsi_write(dsi, DSI_PWR_UP, RESET);
712+
else
716713
dsi_write(dsi, DSI_MODE_CFG, ENABLE_VIDEO_MODE);
717-
dw_mipi_dsi_video_mode_config(dsi);
718-
dsi_write(dsi, DSI_PWR_UP, POWERUP);
719-
}
720714
}
721715

722716
static void dw_mipi_dsi_init(struct dw_mipi_dsi *dsi)
@@ -776,7 +770,6 @@ static void dw_mipi_dsi_command_mode_config(struct dw_mipi_dsi *dsi)
776770
{
777771
dsi_write(dsi, DSI_TO_CNT_CFG, HSTX_TO_CNT(1000) | LPRX_TO_CNT(1000));
778772
dsi_write(dsi, DSI_BTA_TO_CNT, 0xd00);
779-
dsi_write(dsi, DSI_MODE_CFG, ENABLE_CMD_MODE);
780773
}
781774

782775
/* Get lane byte clock cycles. */
@@ -869,7 +862,7 @@ static void rockchip_dsi_pre_disable(struct dw_mipi_dsi *dsi)
869862
return;
870863
}
871864

872-
dw_mipi_dsi_set_mode(dsi, DW_MIPI_DSI_CMD_MODE);
865+
dw_mipi_dsi_set_mode(dsi, DSI_COMMAND_MODE);
873866
}
874867

875868
static void rockchip_dsi_disable(struct dw_mipi_dsi *dsi)
@@ -962,6 +955,7 @@ static void rockchip_dsi_host_init(struct dw_mipi_dsi *dsi)
962955
dw_mipi_dsi_video_mode_config(dsi);
963956
dw_mipi_dsi_video_packet_config(dsi, &dsi->mode);
964957
dw_mipi_dsi_command_mode_config(dsi);
958+
dw_mipi_dsi_set_mode(dsi, DSI_COMMAND_MODE);
965959
dw_mipi_dsi_line_timer_config(dsi);
966960
dw_mipi_dsi_vertical_timing_config(dsi);
967961
dw_mipi_dsi_dphy_timing_config(dsi);
@@ -978,7 +972,7 @@ static void rockchip_dsi_init(struct dw_mipi_dsi *dsi)
978972

979973
static void rockchip_dsi_enable(struct dw_mipi_dsi *dsi)
980974
{
981-
dw_mipi_dsi_set_mode(dsi, DW_MIPI_DSI_VID_MODE);
975+
dw_mipi_dsi_set_mode(dsi, DSI_VIDEO_MODE);
982976
clk_disable_unprepare(dsi->pclk);
983977
}
984978

0 commit comments

Comments
 (0)