Commit 03b135ce authored by Libin Yang's avatar Libin Yang Committed by Takashi Iwai

ALSA: hda - remove controller dependency on i915 power well for SKL

For SKL, only the HDMI codec is in the display power well while the
HD-A controller isn't. So the controller flag 'need_i915_power' is
not set to release the display power after probe, and the codec flag
'link_power_control' is set to request/release the display power via
bus link_power ops.
Signed-off-by: default avatarLibin Yang <libin.yang@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0cbf324e
...@@ -345,6 +345,11 @@ enum { ...@@ -345,6 +345,11 @@ enum {
#define use_vga_switcheroo(chip) 0 #define use_vga_switcheroo(chip) 0
#endif #endif
#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
((pci)->device == 0x0c0c) || \
((pci)->device == 0x0d0c) || \
((pci)->device == 0x160c))
static char *driver_short_names[] = { static char *driver_short_names[] = {
[AZX_DRIVER_ICH] = "HDA Intel", [AZX_DRIVER_ICH] = "HDA Intel",
[AZX_DRIVER_PCH] = "HDA Intel PCH", [AZX_DRIVER_PCH] = "HDA Intel PCH",
...@@ -1976,8 +1981,8 @@ static int azx_probe_continue(struct azx *chip) ...@@ -1976,8 +1981,8 @@ static int azx_probe_continue(struct azx *chip)
* display codec needs the power and it can be released after probe. * display codec needs the power and it can be released after probe.
*/ */
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
/* Baytral/Braswell controllers don't need this power */ /* HSW/BDW controllers need this power */
if (pci->device != 0x0f04 && pci->device != 0x2284) if (CONTROLLER_IN_GPU(pci))
hda->need_i915_power = 1; hda->need_i915_power = 1;
err = snd_hdac_i915_init(bus); err = snd_hdac_i915_init(bus);
......
...@@ -2339,7 +2339,7 @@ static int patch_generic_hdmi(struct hda_codec *codec) ...@@ -2339,7 +2339,7 @@ static int patch_generic_hdmi(struct hda_codec *codec)
* can cover the codec power request, and so need not set this flag. * can cover the codec power request, and so need not set this flag.
* For previous platforms, there is no such power well feature. * For previous platforms, there is no such power well feature.
*/ */
if (is_valleyview_plus(codec)) if (is_valleyview_plus(codec) || is_skylake(codec))
codec->core.link_power_control = 1; codec->core.link_power_control = 1;
if (is_haswell_plus(codec) || is_valleyview_plus(codec)) if (is_haswell_plus(codec) || is_valleyview_plus(codec))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment