From c0afc8df2c54301034e0ad8a537c7b817b72e06a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Tue, 12 Jul 2016 22:40:01 +0200 Subject: [PATCH] Revert "ALSA: hda - remove controller dependency on i915 power well for SKL" This reverts commit 03b135cebc47d75ea2dc346770374ab741966955. --- sound/pci/hda/hda_intel.c | 4 +++- sound/pci/hda/patch_hdmi.c | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 94089fc71884..139ab83626fd 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -361,7 +361,9 @@ enum { #define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \ ((pci)->device == 0x0c0c) || \ ((pci)->device == 0x0d0c) || \ - ((pci)->device == 0x160c)) + ((pci)->device == 0x160c) || \ + ((pci)->device == 0xa170) || \ + ((pci)->device == 0x9d70)) #define IS_SKL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa170) #define IS_SKL_LP(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x9d70) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index a010d704e0e2..6ee685a49a08 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -2285,8 +2285,7 @@ static int patch_generic_hdmi(struct hda_codec *codec) * can cover the codec power request, and so need not set this flag. * For previous platforms, there is no such power well feature. */ - if (is_valleyview_plus(codec) || is_skylake(codec) || - is_broxton(codec)) + if (is_valleyview_plus(codec) || is_broxton(codec)) codec->core.link_power_control = 1; if (hdmi_parse_codec(codec) < 0) { -- 2.7.4