Skip to content

Commit

Permalink
ALSA: hda - Continue probing even if i915 binding fails
Browse files Browse the repository at this point in the history
Currently snd-hda-intel driver aborts the probing of Intel HD-audio
controller with i915 power well management when binding with i915
driver via hda_i915_init() fails.  This is no big problem for Haswell
and Broadwell where the HD-audio controllers are dedicated to
HDMI/DP, thus i915 link is mandatory.  However, Skylake, Baytrail and
Braswell have only one controller and both HDMI/DP and analog codecs
share the same bus.  Thus, even if HDMI/DP isn't usable, we should
keep the controller working for other codecs.

For fixing this, this patch simply allows continuing the probing even
if hda_i915_init() call fails.  This may leave stale sound components
for HDMI/DP devices that are unbound with graphics.  We could abort
the probing selectively, but from the code simplicity POV, it's better
to continue in all cases.

Reported-by: Libin Yang <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
tiwai committed Jun 11, 2015
1 parent 98a226e commit bf06848
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1855,7 +1855,7 @@ static int azx_probe_continue(struct azx *chip)
#ifdef CONFIG_SND_HDA_I915
err = hda_i915_init(hda);
if (err < 0)
goto out_free;
goto skip_i915;
err = hda_display_power(hda, true);
if (err < 0) {
dev_err(chip->card->dev,
Expand All @@ -1865,6 +1865,7 @@ static int azx_probe_continue(struct azx *chip)
#endif
}

skip_i915:
err = azx_first_init(chip);
if (err < 0)
goto out_free;
Expand Down

0 comments on commit bf06848

Please sign in to comment.