summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorSubhransu S. Prusty <subhransu.s.prusty@intel.com>2016-04-01 13:36:27 +0530
committerMark Brown <broonie@kernel.org>2016-04-02 09:28:47 -0700
commitaf037412629d8549e04039a57cf99a59b6e7a01b (patch)
treea1adbb2cfa4fc8477b51af32e1d2798d4f071c30 /sound
parent4f329d9fbab630af44db2f787eb79ca52e6ba22e (diff)
downloadlinux-af037412629d8549e04039a57cf99a59b6e7a01b.tar.gz
linux-af037412629d8549e04039a57cf99a59b6e7a01b.tar.bz2
linux-af037412629d8549e04039a57cf99a59b6e7a01b.zip
ASoC: Intel: Skylake: Fix to turn OFF codec power when entering S3
Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/skylake/skl.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 07d9bc1cf3cb..3982f5536f2d 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -222,6 +222,7 @@ static int skl_suspend(struct device *dev)
struct hdac_ext_bus *ebus = pci_get_drvdata(pci);
struct skl *skl = ebus_to_skl(ebus);
struct hdac_bus *bus = ebus_to_hbus(ebus);
+ int ret = 0;
/*
* Do not suspend if streams which are marked ignore suspend are
@@ -232,10 +233,20 @@ static int skl_suspend(struct device *dev)
enable_irq_wake(bus->irq);
pci_save_state(pci);
pci_disable_device(pci);
- return 0;
} else {
- return _skl_suspend(ebus);
+ ret = _skl_suspend(ebus);
+ if (ret < 0)
+ return ret;
}
+
+ if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {
+ ret = snd_hdac_display_power(bus, false);
+ if (ret < 0)
+ dev_err(bus->dev,
+ "Cannot turn OFF display power on i915\n");
+ }
+
+ return ret;
}
static int skl_resume(struct device *dev)