diff options
| author | Nicolin Chen <b42378@freescale.com> | 2013-06-07 17:31:13 +0800 |
|---|---|---|
| committer | Nicolin Chen <b42378@freescale.com> | 2013-06-08 18:26:01 +0800 |
| commit | 3811d5308694c4024e1e07934acd68016632facc (patch) | |
| tree | bef1c96bde7f61820d72b944d5b6df4091eea0fe /drivers | |
| parent | 44c38e9e568ddfb975054a57a7329a0ca0a47df4 (diff) | |
ENGR00266213-1 dma: imx-sdma: bypass DMA_ERROR for HDMI audio
HDMI audio has its own dma, using sdma just to support dual fifo.
If not bypass DMA_ERROR, HDMI audio will not resume its playback
after hdmi-dma driver receives a SNDRV_PCM_TRIGGER_STOP signal,
HDMI hotplug or ALSA underrun for example.
Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <b42378@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/imx-sdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index af19d8758243..b75069b409fc 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1327,7 +1327,8 @@ static void sdma_issue_pending(struct dma_chan *chan) struct sdma_channel *sdmac = to_sdma_chan(chan); struct sdma_engine *sdma = sdmac->sdma; - if (sdmac->status == DMA_IN_PROGRESS) + /* Only HDMI audio uses other_script, it does not care channel status */ + if (sdmac->status == DMA_IN_PROGRESS || sdmac->other_script) sdma_enable_channel(sdma, sdmac->channel); } |