Patchwork UBUNTU: [Upstream] ALSA: hda - Add another entry for Nvidia HDMI device

login
register
mail settings
Submitter Surbhi Palande
Date Sept. 22, 2009, 6:51 p.m.
Message ID <1253645514-13610-1-git-send-email-surbhi.palande@canonical.com>
Download mbox | patch
Permalink /patch/34094/
State Accepted
Headers show

Comments

Surbhi Palande - Sept. 22, 2009, 6:51 p.m.
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 <tiwai@suse.de>
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 <tiwai@suse.de>
(cherry picked from commit f8ff035e38514ea60aae8752af45ed90e7598fcd)

Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com>
---
 sound/pci/hda/patch_nvhdmi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Tim Gardner - Sept. 22, 2009, 10:03 p.m.
Surbhi Palande wrote:
> 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 <tiwai@suse.de>
> 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 <tiwai@suse.de>
> (cherry picked from commit f8ff035e38514ea60aae8752af45ed90e7598fcd)
> 
> Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com>
> ---
>  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");

applied

Patch

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");