diff options
| author | Daniel Silsby <dansilsby@gmail.com> | 2018-08-29 23:32:56 +0200 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2018-09-11 09:29:26 +0200 |
| commit | 83ef4fb7556b6a673f755da670cbacab7e2c7f1b (patch) | |
| tree | 8ff6dcb08770106064a0e22ceb410d586412beb1 | |
| parent | dmaengine: dma-jz4780: Set DTCn register explicitly (diff) | |
| download | linux-83ef4fb7556b6a673f755da670cbacab7e2c7f1b.tar.xz linux-83ef4fb7556b6a673f755da670cbacab7e2c7f1b.zip | |
dmaengine: dma-jz4780: Further residue status fix
Func jz4780_dma_desc_residue() expects the index to the next hw
descriptor as its last parameter. Caller func jz4780_dma_tx_status(),
however, applied modulus before passing it. When the current hw
descriptor was last in the list, the index passed became zero.
The resulting excess of reported residue especially caused problems
with cyclic DMA transfer clients, i.e. ALSA AIC audio output, which
rely on this for determining current DMA location within buffer.
Combined with the recent and related residue-reporting fixes, spurious
ALSA audio underruns on jz4770 hardware are now fixed.
Signed-off-by: Daniel Silsby <dansilsby@gmail.com>
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Tested-by: Mathieu Malaterre <malat@debian.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
| -rw-r--r-- | drivers/dma/dma-jz4780.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index d3b915ec8a09..b73d96166637 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -653,7 +653,7 @@ static enum dma_status jz4780_dma_tx_status(struct dma_chan *chan, to_jz4780_dma_desc(vdesc), 0); } else if (cookie == jzchan->desc->vdesc.tx.cookie) { txstate->residue = jz4780_dma_desc_residue(jzchan, jzchan->desc, - (jzchan->curr_hwdesc + 1) % jzchan->desc->count); + jzchan->curr_hwdesc + 1); } else txstate->residue = 0; |