diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-01-20 15:00:26 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-01-20 15:00:26 +0100 |
| commit | bed2e98e1f4db8b827df507abc30be7b11b0613d (patch) | |
| tree | 8d02729367907aed033e7a48d01f2418e22a51f6 /sound | |
| parent | 3568459a51136f418ca8cad48a0db3803010148a (diff) | |
| download | lwn-bed2e98e1f4db8b827df507abc30be7b11b0613d.tar.gz lwn-bed2e98e1f4db8b827df507abc30be7b11b0613d.zip | |
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=111021
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/hda/hdac_i915.c | 2 | ||||
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index c50177fb469f..f6854dbd7d8d 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -306,7 +306,7 @@ out_master_del: out_err: kfree(acomp); 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; } diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index c0bef11afa7e..86bbc6307c4f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2078,9 +2078,11 @@ static int azx_probe_continue(struct azx *chip) * for other chips, still continue probing as other * 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; - else + } else goto skip_i915; } |