Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 480564a0 authored by John Keeping's avatar John Keeping Committed by Sean Paul
Browse files

drm/rockchip: dw-mipi-dsi: fix generic packet status check 



We want to check that both the GEN_CMD_EMPTY and GEN_PLD_W_EMPTY bits
are set so we can't just check "val & mask" because that will be true if
either bit is set.

Signed-off-by: default avatarJohn Keeping <john@metanate.com>
Reviewed-by: default avatarChris Zhong <zyw@rock-chips.com>
Reviewed-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170224125506.21533-6-john@metanate.com
parent d3852c21

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

+3 −2
Original line number Diff line number Diff line
@@ -545,7 +545,7 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, 
static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val)

{

	int ret;

	u32 val;

	u32 val, mask;



	ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,

				 val, !(val & GEN_CMD_FULL), 1000,
@@ -557,8 +557,9 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) 


	dsi_write(dsi, DSI_GEN_HDR, hdr_val);



	mask = GEN_CMD_EMPTY | GEN_PLD_W_EMPTY;

	ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS,

				 val, val & (GEN_CMD_EMPTY | GEN_PLD_W_EMPTY),

				 val, (val & mask) == mask,

				 1000, CMD_PKT_STATUS_TIMEOUT_US);

	if (ret < 0) {

		dev_err(dsi->dev, "failed to write command FIFO\n");