From patchwork Wed Jul 3 07:06:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilia Mirkin X-Patchwork-Id: 2815301 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 40772BF4A1 for ; Wed, 3 Jul 2013 07:06:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 211792012D for ; Wed, 3 Jul 2013 07:06:40 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id C294820129 for ; Wed, 3 Jul 2013 07:06:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61234E5F39 for ; Wed, 3 Jul 2013 00:06:38 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qa0-f46.google.com (mail-qa0-f46.google.com [209.85.216.46]) by gabe.freedesktop.org (Postfix) with ESMTP id E7C8AE63A0; Wed, 3 Jul 2013 00:06:20 -0700 (PDT) Received: by mail-qa0-f46.google.com with SMTP id ih17so3392300qab.19 for ; Wed, 03 Jul 2013 00:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=oz0PajxE7Dwf4zwzGjI44ki4JNqcdN3GCiVY3ZjdH10=; b=0YUD45giM13xD37RH1CtFkjwAimL0jNIM8p6QWGTtdEISek83+iYHo0V9hkZPX/f+Z lBajeoay3xClRuzViUXHpcWLixxAP4fMqJIxgNW2tCLzbKoBQhmTnCmXeNYC5wQPZB3S Zb5k9160s8HXwV3HN2UPdJUgzFDiKmr7NVwCOjMT7Vy9UfVQVDpQU/UDPyWRv5hPZFe7 sdKmlbphfvDsMLfAR//gAMbjLpbS+SuDqfpnjiJcABQMQmH/dehuhenrhF9vU0bQFP0/ D47K2C2YdjjBUF8hAtZwM/QDERQjqwoo7vs/sqBX69AnnZxIjgGPk0M6dzfDZU8KKWjx 9mDA== X-Received: by 10.224.74.72 with SMTP id t8mr1882218qaj.74.1372835180324; Wed, 03 Jul 2013 00:06:20 -0700 (PDT) Received: from localhost.localdomain (cpe-74-66-24-174.nyc.res.rr.com. [74.66.24.174]) by mx.google.com with ESMTPSA id w2sm41155920qec.8.2013.07.03.00.06.18 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Jul 2013 00:06:19 -0700 (PDT) From: Ilia Mirkin To: Ben Skeggs Subject: [PATCH] drm/nva3/disp: Fix HDMI audio regression Date: Wed, 3 Jul 2013 03:06:02 -0400 Message-Id: <1372835162-8630-1-git-send-email-imirkin@alum.mit.edu> X-Mailer: git-send-email 1.8.1.5 Cc: nouveau@lists.freedesktop.org, Max Baldwin , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 This is the nva3 counterpart to commit beba44b17 (drm/nv84/disp: Fix HDMI audio regression). The regression happened as a result of refactoring in commit 8e9e3d2de (drm/nv84/disp: move hdmi control into core). Reported-and-tested-by: Max Baldwin Signed-off-by: Ilia Mirkin --- The actual testing was done on a NVCF card (550 Ti). Prior to this, AC3/DTS audio passthrough worked, but regular audio did not. With this change, regular audio started to work too. This should probably be sent to stable as well. drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c b/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c index f065fc2..db8c6fd 100644 --- a/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c +++ b/drivers/gpu/drm/nouveau/core/engine/disp/hdminva3.c @@ -55,6 +55,10 @@ nva3_hdmi_ctrl(struct nv50_disp_priv *priv, int head, int or, u32 data) nv_wr32(priv, 0x61c510 + soff, 0x00000000); nv_mask(priv, 0x61c500 + soff, 0x00000001, 0x00000001); + nv_mask(priv, 0x61c5d0 + soff, 0x00070001, 0x00010001); /* SPARE, HW_CTS */ + nv_mask(priv, 0x61c568 + soff, 0x00010101, 0x00000000); /* ACR_CTRL, ?? */ + nv_mask(priv, 0x61c578 + soff, 0x80000000, 0x80000000); /* ACR_0441_ENABLE */ + /* ??? */ nv_mask(priv, 0x61733c, 0x00100000, 0x00100000); /* RESETF */ nv_mask(priv, 0x61733c, 0x10000000, 0x10000000); /* LOOKUP_EN */