From patchwork Wed Jun 17 04:01:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Airlie X-Patchwork-Id: 6621761 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C9C759F326 for ; Wed, 17 Jun 2015 04:02:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1529D20806 for ; Wed, 17 Jun 2015 04:02:18 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4A86920804 for ; Wed, 17 Jun 2015 04:02:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C136A7A010; Tue, 16 Jun 2015 21:02:16 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 368E87A010 for ; Tue, 16 Jun 2015 21:02:16 -0700 (PDT) Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 0A93A3500EB for ; Wed, 17 Jun 2015 04:02:16 +0000 (UTC) Received: from dreadlord-bne-redhat-com.bne.redhat.com (dhcp-40-179.bne.redhat.com [10.64.40.179]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5H421Jp010302 for ; Wed, 17 Jun 2015 00:02:14 -0400 From: Dave Airlie To: intel-gfx@lists.freedesktop.org Date: Wed, 17 Jun 2015 14:01:59 +1000 Message-Id: <1434513719-3580-5-git-send-email-airlied@gmail.com> In-Reply-To: <1434513719-3580-1-git-send-email-airlied@gmail.com> References: <1434513719-3580-1-git-send-email-airlied@gmail.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Subject: [Intel-gfx] [PATCH 4/4] snd/hdmi: hack out haswell codec workaround X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dave Airlie 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 --- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+) 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);