[4/4] snd/hdmi: hack out haswell codec workaround

Commit Message

Dave Airlie June 17, 2015, 4:01 a.m. UTC

From: Dave Airlie <[e-mail]>

This breaks MST audio, as it appears the hw doesn't
operate like the code believes.

What seems to happen if we have 3 pins, 5, 6, 7
and 6 is connected to 3 devices and 5/7 are connected
to 0 devices, then devices 5/7 act always as if they
are equivalent to pin 6 device 0.

So I connected pin 6 device 0 to channel 1, then
this code goes and connects pin 5/7 to channel 0
but this actually reprograms pin 6 device 0 to channel
0 at the same time and breaks audio.

Signed-off-by: Dave Airlie <[e-mail]>
---
 sound/pci/hda/patch_hdmi.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 8272656..7a4aeac 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1411,6 +1411,7 @@  static void intel_not_share_assigned_cvt(struct hda_codec *codec,
 	int cvt_idx, curr;
 	struct hdmi_spec_per_cvt *per_cvt;
 
+	return;
 	/* configure all pins, including "no physical connection" ones */
 	for_each_hda_codec_node(nid, codec) {
 		unsigned int wid_caps = get_wcaps(codec, nid);