|
@@ -1557,6 +1557,31 @@ int snd_hda_codec_update_widgets(struct hda_codec *codec)
|
|
|
EXPORT_SYMBOL_HDA(snd_hda_codec_update_widgets);
|
|
|
|
|
|
|
|
|
+#ifdef CONFIG_SND_HDA_CODEC_HDMI
|
|
|
+/* if all audio out widgets are digital, let's assume the codec as a HDMI/DP */
|
|
|
+static bool is_likely_hdmi_codec(struct hda_codec *codec)
|
|
|
+{
|
|
|
+ hda_nid_t nid = codec->start_nid;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ for (i = 0; i < codec->num_nodes; i++, nid++) {
|
|
|
+ unsigned int wcaps = get_wcaps(codec, nid);
|
|
|
+ switch (get_wcaps_type(wcaps)) {
|
|
|
+ case AC_WID_AUD_IN:
|
|
|
+ return false; /* HDMI parser supports only HDMI out */
|
|
|
+ case AC_WID_AUD_OUT:
|
|
|
+ if (!(wcaps & AC_WCAP_DIGITAL))
|
|
|
+ return false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+}
|
|
|
+#else
|
|
|
+/* no HDMI codec parser support */
|
|
|
+#define is_likely_hdmi_codec(codec) false
|
|
|
+#endif /* CONFIG_SND_HDA_CODEC_HDMI */
|
|
|
+
|
|
|
/**
|
|
|
* snd_hda_codec_configure - (Re-)configure the HD-audio codec
|
|
|
* @codec: the HDA codec
|
|
@@ -1582,6 +1607,8 @@ int snd_hda_codec_configure(struct hda_codec *codec)
|
|
|
patch = codec->preset->patch;
|
|
|
if (!patch) {
|
|
|
unload_parser(codec); /* to be sure */
|
|
|
+ if (is_likely_hdmi_codec(codec))
|
|
|
+ patch = load_parser(codec, snd_hda_parse_hdmi_codec);
|
|
|
#ifdef CONFIG_SND_HDA_GENERIC
|
|
|
if (!patch)
|
|
|
patch = load_parser(codec, snd_hda_parse_generic_codec);
|