From e91794d42523184614a6dab4778678b60c52eb46 Mon Sep 17 00:00:00 2001 From: Libin Yang Date: Mon, 21 Jan 2019 14:11:31 +0800 Subject: [PATCH] ASoC: sof: Fix display power regression Now that the ASoC hdmi audio PM sequence issue has been fixed by: commit 687ae9e287b3 ("ASoC: intel: skl: Fix display power regression") SOF need the corresponding modifications. Now snd_hdac_display_power() to turn display power on/off is only used in probe and exit for controller. Signed-off-by: Libin Yang --- sound/soc/sof/intel/hda-dsp.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 8673e38666f830..c6160478c49fad 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -404,9 +404,6 @@ static int hda_resume(struct snd_sof_dev *sdev) int hda_dsp_resume(struct snd_sof_dev *sdev) { - /* turn display power on */ - hda_codec_i915_get(sdev); - /* init hda controller. DSP cores will be powered up during fw boot */ return hda_resume(sdev); } @@ -435,8 +432,5 @@ int hda_dsp_suspend(struct snd_sof_dev *sdev, int state) return ret; } - /* turn display power off */ - hda_codec_i915_put(sdev); - return 0; }