Commit 535115b5 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Abort the probe without i915 binding for HSW/BDW

The previous patch tried to continue the probe if i915 binding fails.
For for simplicity reason, we haven't implemented abort even for
controller chips that are dedicated for HDMI/DP on HSW and BDW.
However, Mengdong suggested that this can be dangerous; BIOS may
disable gfx power well although the PCI entry for HD-audio is left,
and this may result in the unexpected behavior, kernel errors, etc.

For avoiding this situation, abort the probe at i915 binding failure
only for HSW/BDW chips selectively.  For other chips, it still
continues.

Fixes: bf06848b ('ALSA: hda - Continue probing even if i915 binding fails')
Reported-by: default avatarMengdong Lin <mengdong.lin@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a686ec4c
...@@ -340,6 +340,11 @@ enum { ...@@ -340,6 +340,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",
...@@ -1854,8 +1859,17 @@ static int azx_probe_continue(struct azx *chip) ...@@ -1854,8 +1859,17 @@ static int azx_probe_continue(struct azx *chip)
if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) { if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL) {
#ifdef CONFIG_SND_HDA_I915 #ifdef CONFIG_SND_HDA_I915
err = hda_i915_init(hda); err = hda_i915_init(hda);
if (err < 0) if (err < 0) {
goto skip_i915; /* if the controller is bound only with HDMI/DP
* (for HSW and BDW), we need to abort the probe;
* for other chips, still continue probing as other
* codecs can be on the same link.
*/
if (CONTROLLER_IN_GPU(pci))
goto out_free;
else
goto skip_i915;
}
err = hda_display_power(hda, true); err = hda_display_power(hda, true);
if (err < 0) { if (err < 0) {
dev_err(chip->card->dev, dev_err(chip->card->dev,
......
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