Unverified Commit 1372c768 authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: SOF: Intel: hda: turn off display power in resume 



Turn off display power at the end of controller resume flow. This is now
possible with the changes done in commit 87fc20e4 ("ASoC: SOF:
Intel: hda: use hdac_ext fine-grained link management"). As codec driver
is able to request the HDA link to be brought back up, the controller
no longer needs to blindly keep display power enabled.

Co-developed-by: default avatarSathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Signed-off-by: default avatarSathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarKeyon Jie <yang.jie@intel.com>
Link: https://lore.kernel.org/r/20210224141541.3331254-1-kai.vehmanen@linux.intel.com


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

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

+5 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 
	if (ret < 0) {

		dev_err(sdev->dev,

			"error: failed to start controller after resume\n");

		return ret;

		goto cleanup;

	}



#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA)
@@ -704,6 +704,10 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) 
	hda_dsp_ctrl_ppcap_enable(sdev, true);

	hda_dsp_ctrl_ppcap_int_enable(sdev, true);



cleanup:

	/* display codec can powered off after controller init */

	hda_codec_i915_display_power(sdev, false);



	return 0;

}