From owner-svn-src-all@FreeBSD.ORG  Tue Jan 24 17:31:28 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0CB1E106566C;
	Tue, 24 Jan 2012 17:31:28 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F01448FC12;
	Tue, 24 Jan 2012 17:31:27 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0OHVRAr085013;
	Tue, 24 Jan 2012 17:31:27 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0OHVRKd085011;
	Tue, 24 Jan 2012 17:31:27 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201201241731.q0OHVRKd085011@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Tue, 24 Jan 2012 17:31:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230511 - head/sys/dev/sound/pci/hda
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jan 2012 17:31:28 -0000

Author: mav
Date: Tue Jan 24 17:31:27 2012
New Revision: 230511
URL: http://svn.freebsd.org/changeset/base/230511

Log:
  Enable High Bit Rate (HBR) Encoded Packet Type (EPT), if supported
  (HDMI and HBR bits set) and needed (AC3 format used with 8 channels).
  This should allow DTS-HD/TrueHD pass-through with rates above 6.144Mbps.
  
  MFC after:	2 months
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/dev/sound/pci/hda/hdaa.c

Modified: head/sys/dev/sound/pci/hda/hdaa.c
==============================================================================
--- head/sys/dev/sound/pci/hda/hdaa.c	Tue Jan 24 15:20:31 2012	(r230510)
+++ head/sys/dev/sound/pci/hda/hdaa.c	Tue Jan 24 17:31:27 2012	(r230511)
@@ -1506,6 +1506,21 @@ hdaa_audio_setup(struct hdaa_chan *ch)
 				     >> (k * 4)) & 0xf) << 4) | k));
 			}
 
+			/*
+			 * Enable High Bit Rate (HBR) Encoded Packet Type
+			 * (EPT), if supported and needed (8ch data).
+			 */
+			if (HDA_PARAM_PIN_CAP_HDMI(wp->wclass.pin.cap) &&
+			    HDA_PARAM_PIN_CAP_HBR(wp->wclass.pin.cap)) {
+				wp->wclass.pin.ctrl &=
+				    ~HDA_CMD_SET_PIN_WIDGET_CTRL_VREF_ENABLE_MASK;
+				if ((ch->fmt & AFMT_AC3) && (cchn == 8))
+					wp->wclass.pin.ctrl |= 0x03;
+				hda_command(ch->devinfo->dev,
+				    HDA_CMD_SET_PIN_WIDGET_CTRL(0, nid,
+				    wp->wclass.pin.ctrl));
+			}
+
 			/* Stop audio infoframe transmission. */
 			hda_command(ch->devinfo->dev,
 			    HDA_CMD_SET_HDMI_DIP_INDEX(0, nid, 0x00));