[coreboot-gerrit] Change in coreboot[master]: rockchip/rk3399: improve mipi transfer flow
Lin Huang (Code Review)
gerrit at coreboot.org
Wed Nov 15 04:28:16 CET 2017
Lin Huang has uploaded this change for review. ( https://review.coreboot.org/22469
Change subject: rockchip/rk3399: improve mipi transfer flow
......................................................................
rockchip/rk3399: improve mipi transfer flow
check GEN_CMD_FULL status before transfer, check
GEN_CMD_EMPTY and GEN_PLD_W_EMPTY status after
transfer.
Change-Id: I936c0d888b10f13141519f95ac7bcae3e15e95d9
Signed-off-by: Lin Huang <hl at rock-chips.com>
---
M src/soc/rockchip/rk3399/include/soc/mipi.h
M src/soc/rockchip/rk3399/mipi.c
2 files changed, 72 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/22469/1
diff --git a/src/soc/rockchip/rk3399/include/soc/mipi.h b/src/soc/rockchip/rk3399/include/soc/mipi.h
index d716717..3b0b00e 100644
--- a/src/soc/rockchip/rk3399/include/soc/mipi.h
+++ b/src/soc/rockchip/rk3399/include/soc/mipi.h
@@ -243,6 +243,17 @@
#define AFE_BIAS_BANDGAP_ANALOG_PROGRAMMABILITY 0x22
#define HS_RX_CONTROL_OF_LANE_0 0x44
+#define GEN_CMD_EMPTY BIT(0)
+#define GEN_CMD_FULL BIT(1)
+#define GEN_PLD_W_EMPTY BIT(2)
+#define GEN_PLD_W_FULL BIT(3)
+#define GEN_PLD_R_EMPTY BIT(4)
+#define GEN_PLD_R_FULL BIT(5)
+#define GEN_RD_CMD_BUSY BIT(6)
+
+#define MIPI_DSI_DCS_SHORT_WRITE 0x05
+#define MIPI_DSI_DCS_LONG_WRITE 0x39
+
enum mipi_dsi_pixel_format {
MIPI_DSI_FMT_RGB888,
MIPI_DSI_FMT_RGB666,
diff --git a/src/soc/rockchip/rk3399/mipi.c b/src/soc/rockchip/rk3399/mipi.c
index 12e6608..e69eb49 100644
--- a/src/soc/rockchip/rk3399/mipi.c
+++ b/src/soc/rockchip/rk3399/mipi.c
@@ -460,26 +460,68 @@
TX_ESC_CLK_DIVIDSION(esc_clk_division));
}
-static int rk_mipi_dsi_dcs_transfer(struct rk_mipi_dsi *dsi, u32 hdr_val)
+static void rk_mipi_message_config(struct rk_mipi_dsi *dsi)
{
- int ret;
-
- hdr_val = GEN_HDATA(hdr_val) | GEN_HTYPE(0x05);
- ret = read32(&mipi_regs->dsi_cmd_pkt_status);
- if (ret < 0) {
- printk(BIOS_DEBUG, "failed to get available command FIFO\n");
- return ret;
- }
-
write32(&mipi_regs->dsi_lpclk_ctrl, 0);
write32(&mipi_regs->dsi_cmd_mode_cfg, CMD_MODE_ALL_LP);
+}
+
+static int rk_mipi_dsi_check_cmd_fifo(struct rk_mipi_dsi *dsi)
+{
+ struct stopwatch sw;
+ int val;
+
+ stopwatch_init_msecs_expire(&sw, 20);
+ do {
+ val = read32(&mipi_regs->dsi_cmd_pkt_status);
+ if (!(val & GEN_CMD_FULL))
+ return 0 ;
+ } while (!stopwatch_expired(&sw));
+
+ return -1;
+}
+
+static int rk_mipi_dsi_gen_pkt_hdr_write(struct rk_mipi_dsi *dsi, u32 hdr_val)
+{
+ int val;
+ struct stopwatch sw;
+ u32 mask;
+
+ if (rk_mipi_dsi_check_cmd_fifo(dsi)) {
+ printk(BIOS_ERR, "failed to get available command FIFO\n");
+ return 1;
+ }
+
write32(&mipi_regs->dsi_gen_hdr, hdr_val);
- return 0;
+ mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY;
+ stopwatch_init_msecs_expire(&sw, 20);
+ do {
+ val = read32(&mipi_regs->dsi_cmd_pkt_status);
+ if ((val & mask) == mask)
+ return 0 ;
+ } while (!stopwatch_expired(&sw));
+ printk(BIOS_ERR, "failed to write command FIFO\n");
+
+ return -1;
+}
+
+static int rk_mipi_dsi_dcs_short_write(struct rk_mipi_dsi *dsi,
+ u16 data, u8 type)
+{
+ u32 val;
+
+ rk_mipi_message_config(dsi);
+
+ val = GEN_HDATA(data) | GEN_HTYPE(type);
+
+ return rk_mipi_dsi_gen_pkt_hdr_write(dsi, val);
}
void rk_mipi_prepare(const struct edid *edid, u32 display_on_mdelay, u32 video_mode_mdelay)
{
+ u16 value;
+
rk_mipi.lanes = 4;
rk_mipi.format = MIPI_DSI_FMT_RGB888;
if (rk_mipi_dsi_get_lane_bps(&rk_mipi, edid) < 0)
@@ -501,10 +543,16 @@
rk_mipi_dsi_wait_for_two_frames(&rk_mipi, edid);
rk_mipi_dsi_set_mode(&rk_mipi, MIPI_DSI_CMD_MODE);
- if (rk_mipi_dsi_dcs_transfer(&rk_mipi, MIPI_DCS_EXIT_SLEEP_MODE) < 0)
+
+ value = MIPI_DCS_EXIT_SLEEP_MODE;
+ if (rk_mipi_dsi_dcs_short_write(&rk_mipi,
+ value, MIPI_DSI_DCS_SHORT_WRITE) < 0)
return;
mdelay(display_on_mdelay);
- if (rk_mipi_dsi_dcs_transfer(&rk_mipi, MIPI_DCS_SET_DISPLAY_ON) < 0)
+
+ value = MIPI_DCS_SET_DISPLAY_ON;
+ if (rk_mipi_dsi_dcs_short_write(&rk_mipi,
+ value, MIPI_DSI_DCS_SHORT_WRITE) < 0)
return;
mdelay(video_mode_mdelay);
--
To view, visit https://review.coreboot.org/22469
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I936c0d888b10f13141519f95ac7bcae3e15e95d9
Gerrit-Change-Number: 22469
Gerrit-PatchSet: 1
Gerrit-Owner: Lin Huang <hl at rock-chips.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171115/f783cec0/attachment-0001.html>
More information about the coreboot-gerrit
mailing list