Unverified Commit 274a3e6f authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Intel: hda-dai: No need to decouple host/link DMA twice 

Merge series from Peter Ujfalusi <peter.ujfalusi@linux.intel.com>:

There is no need to decouple a decoupled stream twice.
Keep the decoupling in hda_link_stream_assign() only as it is going to be
executed in all cases.

Drop the outdated comment from hda_link_dma_hw_params() as well since the code
has changed around it.
parents d5bd47f3 fbabebfb

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

+2 −8
Original line number Diff line number Diff line
@@ -126,11 +126,7 @@ hda_link_stream_assign(struct hdac_bus *bus, 
	}



	if (res) {

		/*

		 * Decouple host and link DMA. The decoupled flag

		 * is updated in snd_hdac_ext_stream_decouple().

		 */

		if (!res->decoupled)

		/* Make sure that host and link DMA is decoupled. */

		snd_hdac_ext_stream_decouple_locked(bus, res, true);



		res->link_locked = 1;
@@ -184,7 +180,6 @@ static int hda_link_dma_params(struct hdac_ext_stream *hext_stream, 
	struct hdac_ext_link *link;

	unsigned int format_val;



	snd_hdac_ext_stream_decouple(bus, hext_stream, true);

	snd_hdac_ext_link_stream_reset(hext_stream);



	format_val = snd_hdac_calc_stream_format(params->s_freq, params->ch,
@@ -221,7 +216,6 @@ static int hda_link_dma_hw_params(struct snd_pcm_substream *substream, 
	struct hdac_bus *bus = hstream->bus;

	struct hdac_ext_link *link;



	/* get stored dma data if resuming from system suspend */

	hext_stream = snd_soc_dai_get_dma_data(cpu_dai, substream);

	if (!hext_stream) {

		hext_stream = hda_link_stream_assign(bus, substream);