diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-02-02 22:03:22 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-02-05 08:46:45 +0100 |
| commit | 412bbe7d5b8cdb103af82c3616149138c50d1efa (patch) | |
| tree | 534d2c8f006b77cfe41b9b7c07b430c3f63e4ade /sound/x86 | |
| parent | Merge branch 'topic/intel-lpe-audio' into for-next (diff) | |
| download | linux-412bbe7d5b8cdb103af82c3616149138c50d1efa.tar.xz linux-412bbe7d5b8cdb103af82c3616149138c50d1efa.zip | |
ALSA: x86: Explicit specify 32bit DMA
LPE audio is capable only up to 32bit address, as it seems.
Then we should limit the DMA addresses accordingly via dma-mapping
API.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86')
| -rw-r--r-- | sound/x86/intel_hdmi_audio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index c83f02c2593e..fac30cf2794f 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -28,6 +28,7 @@ #include <linux/module.h> #include <linux/interrupt.h> #include <linux/pm_runtime.h> +#include <linux/dma-mapping.h> #include <asm/cacheflush.h> #include <sound/core.h> #include <sound/asoundef.h> @@ -1825,8 +1826,6 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) struct resource *res_mmio; int i, ret; - dev_dbg(&pdev->dev, "dma_mask: %p\n", pdev->dev.dma_mask); - pdata = pdev->dev.platform_data; if (!pdata) { dev_err(&pdev->dev, "%s: quit: pdata not allocated by i915!!\n", __func__); @@ -1907,6 +1906,11 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev) /* setup the ops for playabck */ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_intelhad_playback_ops); + + /* only 32bit addressable */ + dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); + dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); + /* allocate dma pages for ALSA stream operations * memory allocated is based on size, not max value * thus using same argument for max & size |