From: Mark Brown <broonie@kernel.org>
Date: Tue, 11 Feb 2020 16:18:04 +0000 (+0000)
Subject: Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: Ubuntu-5.10.0-12.13~3089^2^2~207
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7b94ace7ec5e81f3bb79c48d306e79eae4fce4a4;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-5.7
---

7b94ace7ec5e81f3bb79c48d306e79eae4fce4a4
diff --cc sound/soc/sof/intel/hda-dsp.c
index 14228b4931d6,0848b79967a9..0e61c27785a3
--- a/sound/soc/sof/intel/hda-dsp.c
+++ b/sound/soc/sof/intel/hda-dsp.c
@@@ -645,22 -486,10 +651,24 @@@ int hda_dsp_resume(struct snd_sof_dev *
  {
  	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
  	struct pci_dev *pci = to_pci_dev(sdev->dev);
 +	const struct sof_dsp_power_state target_state = {
 +		.state = SOF_DSP_PM_D0,
 +		.substate = SOF_HDA_DSP_PM_D0I0,
 +	};
 +	int ret;
  
 -	if (sdev->s0_suspend) {
 +	/* 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) {
 +			dev_err(sdev->dev, "error: setting dsp state %d substate %d\n",
 +				target_state.state, target_state.substate);
 +			return ret;
 +		}
 +
  		/* restore L1SEN bit */
  		if (hda->l1_support_changed)
  			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,
@@@ -730,26 -536,12 +738,29 @@@ int hda_dsp_suspend(struct snd_sof_dev 
  	struct sof_intel_hda_dev *hda = sdev->pdata->hw_pdata;
  	struct hdac_bus *bus = sof_to_bus(sdev);
  	struct pci_dev *pci = to_pci_dev(sdev->dev);
 +	const struct sof_dsp_power_state target_dsp_state = {
 +		.state = target_state,
 +		.substate = target_state == SOF_DSP_PM_D0 ?
 +				SOF_HDA_DSP_PM_D0I3 : 0,
 +	};
  	int ret;
  
 -	if (sdev->s0_suspend) {
 +	/* cancel any attempt for DSP D0I3 */
 +	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) {
 +			dev_err(sdev->dev, "error: setting dsp state %d substate %d\n",
 +				target_dsp_state.state,
 +				target_dsp_state.substate);
 +			return ret;
 +		}
 +
  		/* enable L1SEN to make sure the system can enter S0Ix */
  		hda->l1_support_changed =
  			snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR,