aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorRene Stange <rsta2@o2online.de>2020-02-07 14:04:28 +0000
committerPeter Maydell <peter.maydell@linaro.org>2020-02-07 14:04:28 +0000
commit25437c09d7c46dea4a87dcff6642ce786fe14d28 (patch)
treed781894a545a4e3216873aabeeebe76183c7a844 /hw
parenteb87ff05eab2a39bc0fcd8b4ec51433c4e7fbe42 (diff)
downloadqemu-25437c09d7c46dea4a87dcff6642ce786fe14d28.zip
qemu-25437c09d7c46dea4a87dcff6642ce786fe14d28.tar.gz
qemu-25437c09d7c46dea4a87dcff6642ce786fe14d28.tar.bz2
bcm2835_dma: Re-initialize xlen in TD mode
TD (two dimensions) DMA mode did not work, because the xlen variable has not been re-initialized before each additional ylen run through in bcm2835_dma_update(). Fix it. Signed-off-by: Rene Stange <rsta2@o2online.de> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/dma/bcm2835_dma.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index 667d951..ccff5ed 100644
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -54,7 +54,7 @@
static void bcm2835_dma_update(BCM2835DMAState *s, unsigned c)
{
BCM2835DMAChan *ch = &s->chan[c];
- uint32_t data, xlen, ylen;
+ uint32_t data, xlen, xlen_td, ylen;
int16_t dst_stride, src_stride;
if (!(s->enable & (1 << c))) {
@@ -82,6 +82,7 @@ static void bcm2835_dma_update(BCM2835DMAState *s, unsigned c)
dst_stride = 0;
src_stride = 0;
}
+ xlen_td = xlen;
while (ylen != 0) {
/* Normal transfer mode */
@@ -117,6 +118,7 @@ static void bcm2835_dma_update(BCM2835DMAState *s, unsigned c)
if (--ylen != 0) {
ch->source_ad += src_stride;
ch->dest_ad += dst_stride;
+ xlen = xlen_td;
}
}
ch->cs |= BCM2708_DMA_END;