From patchwork Tue Sep 22 18:51:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Surbhi Palande X-Patchwork-Id: 34094 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 752A5B7B6B for ; Wed, 23 Sep 2009 04:52:11 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1MqAT6-0001Aa-3B; Tue, 22 Sep 2009 19:52:04 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1MqASz-00019s-Jc for kernel-team@lists.canonical.com; Tue, 22 Sep 2009 19:51:57 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1MqASz-0000rX-I7 for ; Tue, 22 Sep 2009 19:51:57 +0100 Received: from 72-254-89-162.client.stsn.net ([72.254.89.162] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1MqASy-0001FV-PB for kernel-team@lists.canonical.com; Tue, 22 Sep 2009 19:51:57 +0100 From: Surbhi Palande To: kernel-team@lists.canonical.com Subject: [PATCH] UBUNTU: [Upstream] ALSA: hda - Add another entry for Nvidia HDMI device Date: Tue, 22 Sep 2009 11:51:54 -0700 Message-Id: <1253645514-13610-1-git-send-email-surbhi.palande@canonical.com> X-Mailer: git-send-email 1.6.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch adds HDMI audio support for the NVDIA chip, ID 3 This fixes the bug 416482 reported in launchpad. This patch was cherry picked from upstream commit:f8ff035e38514ea60aae8752af45ed90e7598fcd This was merged upstream post 2.6.31. So, please consider merging it in Karmic. The following changes since commit 70fa5a0293f92e66fcab09ea2d88d103dd4e1608: Tim Gardner (1): UBUNTU: Ubuntu-2.6.31-10.35 are available in the git repository at: git://kernel.ubuntu.com/surbhi/ubuntu-karmic.git lp416482 Takashi Iwai (1): UBUNTU: [Upstream] ALSA: hda - Add another entry for Nvidia HDMI device sound/pci/hda/patch_nvhdmi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) From 8372ced18d22b9b6ad118291b3fea66dbc225c46 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 1 Sep 2009 08:53:19 +0200 Subject: [PATCH] UBUNTU: [Upstream] ALSA: hda - Add another entry for Nvidia HDMI device BugLink: https://bugs.launchpad.net/bugs/416482 Added another entry for Nvidia HDMI device (10de:0003). Reference: kernel bug#14097 http://bugzilla.kernel.org/show_bug.cgi?id=14097 Signed-off-by: Takashi Iwai (cherry picked from commit f8ff035e38514ea60aae8752af45ed90e7598fcd) Signed-off-by: Surbhi Palande --- sound/pci/hda/patch_nvhdmi.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index f5792e2..c8435c9 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -377,6 +377,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) */ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { { .id = 0x10de0002, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, + { .id = 0x10de0003, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, { .id = 0x10de0006, .name = "MCP78 HDMI", .patch = patch_nvhdmi_8ch }, { .id = 0x10de0007, .name = "MCP7A HDMI", .patch = patch_nvhdmi_8ch }, { .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch }, @@ -385,6 +386,7 @@ static struct hda_codec_preset snd_hda_preset_nvhdmi[] = { }; MODULE_ALIAS("snd-hda-codec-id:10de0002"); +MODULE_ALIAS("snd-hda-codec-id:10de0003"); MODULE_ALIAS("snd-hda-codec-id:10de0006"); MODULE_ALIAS("snd-hda-codec-id:10de0007"); MODULE_ALIAS("snd-hda-codec-id:10de0067");