Commit bed2e98e authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Degrade i915 binding failure message

Currently HD-audio driver on Intel Skylake or Broxteon gives an error
message when binding with i915 audio component fails.  However, this
isn't any serious error on a system without Intel graphics.  Indeed
there are such systems, where a third-party codec (e.g. Creative) is
put on the mobo while using other discrete GPU (e.g. Nvidia).
Printing a kernel "error" message is overreaction in such a case.

This patch downgrades the print level for that message.  For systems
that mandate the i915 binding (e.g. Haswell or Broadwell HDMI/DP),
another kernel error message is shown in addition to make clear what
went wrong.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=111021Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3568459a
...@@ -306,7 +306,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus) ...@@ -306,7 +306,7 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
out_err: out_err:
kfree(acomp); kfree(acomp);
bus->audio_component = NULL; bus->audio_component = NULL;
dev_err(dev, "failed to add i915 component master (%d)\n", ret); dev_info(dev, "failed to add i915 component master (%d)\n", ret);
return ret; return ret;
} }
......
...@@ -2078,9 +2078,11 @@ static int azx_probe_continue(struct azx *chip) ...@@ -2078,9 +2078,11 @@ static int azx_probe_continue(struct azx *chip)
* for other chips, still continue probing as other * for other chips, still continue probing as other
* codecs can be on the same link. * codecs can be on the same link.
*/ */
if (CONTROLLER_IN_GPU(pci)) if (CONTROLLER_IN_GPU(pci)) {
dev_err(chip->card->dev,
"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
goto out_free; goto out_free;
else } else
goto skip_i915; goto skip_i915;
} }
......
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