Haswell HDMI codec pins may report invalid connection list entries, which
will cause failure to play audio via HDMI or Display Port.
So this patch adds fixup for Haswell to workaround this hardware issue:
enable DP1.2 mode and override the pins' connection list entries with proper
value.
Signed-off-by: Mengdong Lin <email address hidden>
Signed-off-by: Xingchao Wang <email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>
(cherry picked from commit 6ffe168f822cf7f777987cddc00ade542fd73bf0)
We're being advised by Intel to include the following patch for the Quantal kernel, to fix a Haswell/Sharkbay HDMI/DP audio issue. As there are no sharkbay machines out there yet, and the patch contains a "if codec->vendor_id == 80862807" I assume this will cause no regressions.
The commit is already in the 3.8 kernel, so this is just for the 3.5 SRU.
From: Mengdong Lin <email address hidden>
Haswell HDMI codec pins may report invalid connection list entries, which
will cause failure to play audio via HDMI or Display Port.
So this patch adds fixup for Haswell to workaround this hardware issue:
enable DP1.2 mode and override the pins' connection list entries with proper
value.
Signed-off-by: Mengdong Lin <email address hidden> 777987cddc00ade 542fd73bf0)
Signed-off-by: Xingchao Wang <email address hidden>
Signed-off-by: Takashi Iwai <email address hidden>
(cherry picked from commit 6ffe168f822cf7f
BugLink: https:/ /bugs.launchpad .net/bugs/ 1095242
Signed-off-by: David Henningsson <email address hidden>
---
We're being advised by Intel to include the following patch for the Quantal kernel, to fix a Haswell/Sharkbay HDMI/DP audio issue. As there are no sharkbay machines out there yet, and the patch contains a "if codec->vendor_id == 80862807" I assume this will cause no regressions.
The commit is already in the 3.8 kernel, so this is just for the 3.5 SRU.
sound/ pci/hda/ patch_hdmi. c | 28 +++++++ +++++++ +++++++ +++++++
1 file changed, 28 insertions(+)
diff --git a/sound/ pci/hda/ patch_hdmi. c b/sound/ pci/hda/ patch_hdmi. c pci/hda/ patch_hdmi. c pci/hda/ patch_hdmi. c hdmi_patch_ ops = {
index dc249b2..a7e4da4 100644
--- a/sound/
+++ b/sound/
@@ -1323,6 +1323,30 @@ static const struct hda_codec_ops generic_
.unsol_event = hdmi_unsol_event,
};
+static void intel_haswell_ fixup_connect_ list(struct hda_codec *codec) codec_read( codec, 0x08, 0, 0xf81, 0); codec_read( codec, 0x08, 0, 0x781, vendor_param); codec_read( codec, 0x08, 0, 0xf81, 0); override_ conn_list( codec, 0x05, 3, list); override_ conn_list( codec, 0x06, 3, list); override_ conn_list( codec, 0x07, 3, list); hdmi(struct hda_codec *codec) hdmi(struct hda_codec *codec)
+{
+ unsigned int vendor_param;
+ hda_nid_t list[3] = {0x2, 0x3, 0x4};
+
+ vendor_param = snd_hda_
+ if (vendor_param == -1 || vendor_param & 0x02)
+ return;
+
+ /* enable DP1.2 mode */
+ vendor_param |= 0x02;
+ snd_hda_
+
+ vendor_param = snd_hda_
+ if (vendor_param == -1 || !(vendor_param & 0x02))
+ return;
+
+ /* override 3 pins connection list */
+ snd_hda_
+ snd_hda_
+ snd_hda_
+}
+
+
static int patch_generic_
{
struct hdmi_spec *spec;
@@ -1332,6 +1356,10 @@ static int patch_generic_
return -ENOMEM;
codec->spec = spec; fixup_connect_ list(codec) ; codec(codec) < 0) {
+
+ if (codec->vendor_id == 0x80862807)
+ intel_haswell_
+
if (hdmi_parse_
codec->spec = NULL;
kfree(spec);
--
1.7.9.5