Skip to content

Commit cb8e225

Browse files
ranj063gregkh
authored andcommitted
ASoC: SOF: Intel: hda: cancel D0i3 work during runtime suspend
[ Upstream commit 0084364 ] Cancel the D0i3 work during runtime suspend as no streams are active at this point anyway. Fixes: 63e51fd ("ASoC: SOF: Intel: cnl: Implement feature to support DSP D0i3 in S0") Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20210128092345.1033085-1-kai.vehmanen@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 2a387bb commit cb8e225

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -801,11 +801,15 @@ int hda_dsp_runtime_idle(struct snd_sof_dev *sdev)
801801

802802
int hda_dsp_runtime_suspend(struct snd_sof_dev *sdev)
803803
{
804+
struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
804805
const struct sof_dsp_power_state target_state = {
805806
.state = SOF_DSP_PM_D3,
806807
};
807808
int ret;
808809

810+
/* cancel any attempt for DSP D0I3 */
811+
cancel_delayed_work_sync(&hda->d0i3_work);
812+
809813
/* stop hda controller and power dsp off */
810814
ret = hda_suspend(sdev, true);
811815
if (ret < 0)

0 commit comments

Comments
 (0)