Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfe1951b authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: Intel: Use ACPI device for Baytrail PCM buffer allocation 



This follows the same idea than commit 10df3509
("ASoC: Intel: Fix Audio DSP usage when IOMMU is enabled.") by using only
ACPI device for all DMA allocations. Since DMA masking is already done in
firmware loading it can be removed from here.

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6fb8b02b

sound/soc/intel/sst-baytrail-pcm.c

+3 −5
Original line number Diff line number Diff line
@@ -319,18 +319,16 @@ static int sst_byt_pcm_new(struct snd_soc_pcm_runtime *rtd) 
{

	struct snd_pcm *pcm = rtd->pcm;

	size_t size;

	struct snd_soc_platform *platform = rtd->platform;

	struct sst_pdata *pdata = dev_get_platdata(platform->dev);

	int ret = 0;



	ret = dma_coerce_mask_and_coherent(rtd->card->dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;



	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||

	    pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		size = sst_byt_pcm_hardware.buffer_bytes_max;

		ret = snd_pcm_lib_preallocate_pages_for_all(pcm,

							    SNDRV_DMA_TYPE_DEV,

							    rtd->card->dev,

							    pdata->dma_dev,

							    size, size);

		if (ret) {

			dev_err(rtd->dev, "dma buffer allocation failed %d\n",