Commit 3b67b56e authored Jan 20, 2016 by Takashi Iwai Committed by Greg Kroah-Hartman Dec 25, 2017

ALSA: hda - Degrade i915 binding failure message

commit bed2e98e1f4db8b827df507abc30be7b11b0613d upstream.

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>
Cc: Kouta Okamoto <kouta.okamoto@toshiba.co.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ef24d642

sound/hda/hdac_i915.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -240,7 +240,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;
		}

sound/pci/hda/hda_intel.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -2088,9 +2088,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;
		}