Commit c2021db1 authored by Lin Huang's avatar Lin Huang Committed by Andrzej Hajda

drm/bridge: analogix_dp: Check AUX_EN status when doing AUX transfer

We should check AUX_EN bit to confirm the AUX CH operation is completed.

Cc: Stéphane Marchesin <marcheu@chromium.org>
Signed-off-by: default avatarLin Huang <hl@rock-chips.com>
Signed-off-by: default avatarzain wang <wzz@rock-chips.com>
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
Signed-off-by: default avatarThierry Escande <thierry.escande@collabora.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarAndrzej Hajda <a.hajda@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180423105003.9004-3-enric.balletbo@collabora.com
parent 93cba9da
...@@ -1073,9 +1073,9 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, ...@@ -1073,9 +1073,9 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
{ {
u32 reg; u32 reg;
u8 *buffer = msg->buffer; u8 *buffer = msg->buffer;
int timeout_loop = 0;
unsigned int i; unsigned int i;
int num_transferred = 0; int num_transferred = 0;
int ret;
/* Buffer size of AUX CH is 16 bytes */ /* Buffer size of AUX CH is 16 bytes */
if (WARN_ON(msg->size > 16)) if (WARN_ON(msg->size > 16))
...@@ -1139,17 +1139,20 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, ...@@ -1139,17 +1139,20 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp,
writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2);
/* Is AUX CH command reply received? */ ret = readx_poll_timeout(readl, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2,
/* TODO: Wait for an interrupt instead of looping? */ reg, !(reg & AUX_EN), 25, 500 * 1000);
reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); if (ret) {
while (!(reg & RPLY_RECEIV)) { dev_err(dp->dev, "AUX CH enable timeout!\n");
timeout_loop++;
if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) {
dev_err(dp->dev, "AUX CH command reply failed!\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA);
usleep_range(10, 11); /* TODO: Wait for an interrupt instead of looping? */
/* Is AUX CH command reply received? */
ret = readx_poll_timeout(readl, dp->reg_base + ANALOGIX_DP_INT_STA,
reg, reg & RPLY_RECEIV, 10, 20 * 1000);
if (ret) {
dev_err(dp->dev, "AUX CH cmd reply timeout!\n");
return -ETIMEDOUT;
} }
/* Clear interrupt source for AUX CH command reply */ /* Clear interrupt source for AUX CH command reply */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment