same as https://patchwork.kernel.org/patch/9518417/ Tested-by: Chris Zhong <zyw at rock-chips.com> Reviewed-by: Chris Zhong <zyw at rock-chips.com> On 09/20/2016 01:17 AM, John Keeping wrote: > In a couple of places here we use "val" for the value that is about to > be written to a register but then reuse the same variable for the value > of a status register before we get around to writing it. Rename the > value to be written to so that we write the value we intend to and not > what we have just read from the status register. > > Signed-off-by: John Keeping <john at metanate.com> > --- > drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > index fac2429b9d6d..03915bf9c97d 100644 > --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi.c > @@ -543,9 +543,10 @@ static int dw_mipi_dsi_host_detach(struct mipi_dsi_host *host, > return 0; > } > > -static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 val) > +static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 hdr_val) > { > int ret; > + u32 val; > > ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, > val, !(val & GEN_CMD_FULL), 1000, > @@ -555,7 +556,7 @@ static int dw_mipi_dsi_gen_pkt_hdr_write(struct dw_mipi_dsi *dsi, u32 val) > return ret; > } > > - dsi_write(dsi, DSI_GEN_HDR, val); > + dsi_write(dsi, DSI_GEN_HDR, hdr_val); > > ret = readx_poll_timeout(readl, dsi->base + DSI_CMD_PKT_STATUS, > val, val & (GEN_CMD_EMPTY | GEN_PLD_W_EMPTY), > @@ -588,8 +589,9 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > { > const u32 *tx_buf = msg->tx_buf; > int len = msg->tx_len, pld_data_bytes = sizeof(*tx_buf), ret; > - u32 val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > + u32 hdr_val = GEN_HDATA(msg->tx_len) | GEN_HTYPE(msg->type); > u32 remainder = 0; > + u32 val; > > if (msg->tx_len < 3) { > dev_err(dsi->dev, "wrong tx buf length %zu for long write\n", > @@ -618,7 +620,7 @@ static int dw_mipi_dsi_dcs_long_write(struct dw_mipi_dsi *dsi, > } > } > > - return dw_mipi_dsi_gen_pkt_hdr_write(dsi, val); > + return dw_mipi_dsi_gen_pkt_hdr_write(dsi, hdr_val); > } > > static ssize_t dw_mipi_dsi_host_transfer(struct mipi_dsi_host *host,
