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

ASoC: SOF: Intel: simplify logic for DMI_L1 handling 



We don't need to test in multiple places if the kconfig
SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is enabled or not, we might as
well set the existing DMI_L1_COMPATIBLE flag.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210812231940.172547-4-pierre-louis.bossart@linux.intel.com


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

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

+2 −1
Original line number Diff line number Diff line
@@ -229,7 +229,8 @@ int hda_dsp_pcm_open(struct snd_sof_dev *sdev, 
	}



	/* All playback and D0i3 compatible streams are DMI L1 capable */

	if (direction == SNDRV_PCM_STREAM_PLAYBACK ||

	if (IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1) ||

	    direction == SNDRV_PCM_STREAM_PLAYBACK ||

	    spcm->stream[substream->stream].d0i3_compatible)

		flags |= SOF_HDA_STREAM_DMI_L1_COMPATIBLE;

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

+5 −6
Original line number Diff line number Diff line
@@ -197,7 +197,6 @@ hda_dsp_stream_get(struct snd_sof_dev *sdev, int direction, u32 flags) 
	 * Workaround to address a known issue with host DMA that results

	 * in xruns during pause/release in capture scenarios.

	 */

	if (!IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1))

	if (!(flags & SOF_HDA_STREAM_DMI_L1_COMPATIBLE))

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,

					HDA_VS_INTEL_EM2,
@@ -240,7 +239,7 @@ int hda_dsp_stream_put(struct snd_sof_dev *sdev, int direction, int stream_tag) 
	spin_unlock_irq(&bus->reg_lock);



	/* Enable DMI L1 if permitted */

	if (!IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1) && dmi_l1_enable)

	if (dmi_l1_enable)

		snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, HDA_VS_INTEL_EM2,

					HDA_VS_INTEL_EM2_L1SEN, HDA_VS_INTEL_EM2_L1SEN);