Unverified Commit 8da5bceb authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda-stream: always allocate CORB/RIRB buffer 



There is no real reason to filter out this allocation at build
time. Let's allocate it always, so that we can have a more dynamic way
of disabling HDaudio codec support without having to recompile.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRander Wang <rander.wang@intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20221027193540.259520-12-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bf2d764b

sound/soc/sof/intel/hda-stream.c

+5 −6
Original line number Diff line number Diff line
@@ -854,15 +854,16 @@ int hda_dsp_stream_init(struct snd_sof_dev *sdev) 
		return -ENOMEM;

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* mem alloc for the CORB/RIRB ringbuffers */

	/*

	 * mem alloc for the CORB/RIRB ringbuffers - this will be used only for

	 * HDAudio codecs

	 */

	ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,

				  PAGE_SIZE, &bus->rb);

	if (ret < 0) {

		dev_err(sdev->dev, "error: RB alloc failed\n");

		return -ENOMEM;

	}

#endif



	/* create capture streams */

	for (i = 0; i < num_capture; i++) {
@@ -995,11 +996,9 @@ void hda_dsp_stream_free(struct snd_sof_dev *sdev) 
	if (bus->posbuf.area)

		snd_dma_free_pages(&bus->posbuf);



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)

	/* free position buffer */

	/* free CORB/RIRB buffer - only used for HDaudio codecs */

	if (bus->rb.area)

		snd_dma_free_pages(&bus->rb);

#endif



	list_for_each_entry_safe(s, _s, &bus->stream_list, list) {

		/* TODO: decouple */