drm/sun4i: Fix dsi dcs long write function
PATCH v2 1/1 drm/sun4i: Fix dsi dcs long write function
It's writing too much data. regmap_bulk_write expects number of register sized chunks to write, not a byte sized length of the bounce buffer. Bounce buffer needs to be padded too, so that regmap_bulk_write will not read past the end of the buffer.
Fixes 133add5b5ad4 ("drm/sun4i: Add Allwinner A31 MIPI-DSI controller support")
Signed-off-by Ondrej Jirman <[email protected]>
Reviewed-by Jernej Skrabec <[email protected]>
---
v2:
- use ALIGN
- add tags
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c +2 -2
@@ -889,7 +889,7 @@ static int sun6i_dsi_dcs_write_long(struct sun6i_dsi *dsi,regmap_write (dsi->regs,SUN6I_DSI_CMD_TX_REG (0 ),sun6i_dsi_dcs_build_pkt_hdr (dsi, msg)); - bounce =kzalloc (msg->tx_len +sizeof (crc),GFP_KERNEL ); + bounce =kzalloc (ALIGN (msg->tx_len +sizeof (crc),4 ),GFP_KERNEL );if (!bounce)return -ENOMEM ;
@@ -900,7 +900,7 @@ static int sun6i_dsi_dcs_write_long(struct sun6i_dsi *dsi,memcpy ((u8 *)bounce + msg->tx_len, &crc,sizeof (crc)); len +=sizeof (crc); -regmap_bulk_write (dsi->regs,SUN6I_DSI_CMD_TX_REG (1 ), bounce, len); +regmap_bulk_write (dsi->regs,SUN6I_DSI_CMD_TX_REG (1 ), bounce,DIV_ROUND_UP (len,4 ));regmap_write (dsi->regs,SUN6I_DSI_CMD_CTL_REG , len +4 -1 );kfree (bounce);
Signature · 1 line
2.28.0
Maxime Ripard
AppliedQuoted 8 lines · Ondrej Jirman
It's writing too much data.
regmap_bulk_writeexpects number of register sized chunks to write, not a byte sized length of the bounce buffer. Bounce buffer needs to be padded too, so thatregmap_bulk_writewill not read past the end of the buffer.Fixes 133add5b5ad4 ("drm/sun4i: Add Allwinner A31 MIPI-DSI controller support")Signed-off-by Ondrej Jirman <[email protected]>Reviewed-by Jernej Skrabec <[email protected]>
Applied, thanks
Maxime