diff options
| author | Mark Brown <broonie@kernel.org> | 2020-02-11 16:18:04 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-02-11 16:18:04 +0000 |
| commit | 7b94ace7ec5e81f3bb79c48d306e79eae4fce4a4 (patch) | |
| tree | 630564db58e408983c2f6c3dcd039e50401c2dac /sound/soc/sof/intel/hda-dsp.c | |
| parent | 9d789dc047e32fb0f85ff192f883a534017512a2 (diff) | |
| parent | af7aae1b1f6306a1cda4da393e920a1334eaa3d4 (diff) | |
| download | linux-next-7b94ace7ec5e81f3bb79c48d306e79eae4fce4a4.tar.gz linux-next-7b94ace7ec5e81f3bb79c48d306e79eae4fce4a4.zip | |
Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
Diffstat (limited to 'sound/soc/sof/intel/hda-dsp.c')
| -rw-r--r-- | sound/soc/sof/intel/hda-dsp.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 14228b4931d6..0e61c27785a3 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -593,6 +593,9 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) return ret; } + /* display codec can powered off after link reset */ + hda_codec_i915_display_power(sdev, false); + return 0; } @@ -604,6 +607,9 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) #endif int ret; + /* display codec must be powered before link reset */ + hda_codec_i915_display_power(sdev, true); + /* * clear TCSEL to clear playback on some HD Audio * codecs. PCI TCSEL is defined in the Intel manuals. @@ -653,6 +659,8 @@ int hda_dsp_resume(struct snd_sof_dev *sdev) /* resume from D0I3 */ if (sdev->dsp_power_state.state == SOF_DSP_PM_D0) { + hda_codec_i915_display_power(sdev, true); + /* Set DSP power state */ ret = hda_dsp_set_power_state(sdev, &target_state); if (ret < 0) { @@ -741,6 +749,9 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, u32 target_state) cancel_delayed_work_sync(&hda->d0i3_work); if (target_state == SOF_DSP_PM_D0) { + /* we can't keep a wakeref to display driver at suspend */ + hda_codec_i915_display_power(sdev, false); + /* Set DSP power state */ ret = hda_dsp_set_power_state(sdev, &target_dsp_state); if (ret < 0) { |