summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/sst-dsp.c
diff options
context:
space:
mode:
authorLiam Girdwood2014-05-02 17:56:31 +0200
committerMark Brown2014-05-02 18:53:02 +0200
commit10df350977b15d44dba0b3b44e3da7989711cb8d (patch)
tree4c8c6254379f1a798b8a072f3067e5c002a1c362 /sound/soc/intel/sst-dsp.c
parentASoC: Intel: Fix Haswell/Broadwell DSP page table creation. (diff)
downloadkernel-qcow2-linux-10df350977b15d44dba0b3b44e3da7989711cb8d.tar.gz
kernel-qcow2-linux-10df350977b15d44dba0b3b44e3da7989711cb8d.tar.xz
kernel-qcow2-linux-10df350977b15d44dba0b3b44e3da7989711cb8d.zip
ASoC: Intel: Fix Audio DSP usage when IOMMU is enabled.
The Intel IOMMU requires that the ACPI device is used to allocate all DMA memory buffers. This means we need to pass the DMA device pointer into child component devices that allocate DMA memory. We also only set the DMA mask for the ACPI device now instead of for each component device. Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel/sst-dsp.c')
-rw-r--r--sound/soc/intel/sst-dsp.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c
index 0c129fd85ecf..0b715b20a2d7 100644
--- a/sound/soc/intel/sst-dsp.c
+++ b/sound/soc/intel/sst-dsp.c
@@ -337,6 +337,7 @@ struct sst_dsp *sst_dsp_new(struct device *dev,
spin_lock_init(&sst->spinlock);
mutex_init(&sst->mutex);
sst->dev = dev;
+ sst->dma_dev = pdata->dma_dev;
sst->thread_context = sst_dev->thread_context;
sst->sst_dev = sst_dev;
sst->id = pdata->id;