[alsa-devel] [PATCH - 1/1] patch_nvhdmi.c: Add missing codec IDs, unify names

[Takashi Iwai]

At Mon,  9 Aug 2010 22:41:40 -0600,
Stephen Warren wrote:
> 
> * Add missing codec IDs.
> * Modify some existing codec names for discrete GPUs to match newly
>   added IDs. Note: existing names were a mixture of marketing and
>   engineering GPU names. Equally, there's no reason that codec IDs
>   have to be specific to a particular GPU or board, so identify
>   codecs in a less marketing-oriented fashion.
> * Reformat codec ID table so it's easier to read, for me at least.
> 
> Signed-off-by: Stephen Warren <swarren at nvidia.com>

Applied now as is.  It doesn't exceed too much over 80 columns ;)


Thanks,

Takashi

> 
> diff --git a/pci/hda/patch_nvhdmi.c b/pci/hda/patch_nvhdmi.c
> index a281836..77e2b40 100644
> --- a/pci/hda/patch_nvhdmi.c
> +++ b/pci/hda/patch_nvhdmi.c
> @@ -540,26 +540,32 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec)
>   * patch entries
>   */
>  static struct hda_codec_preset snd_hda_preset_nvhdmi[] = {
> -	{ .id = 0x10de0002, .name = "MCP77/78 HDMI",
> -	  .patch = patch_nvhdmi_8ch_7x },
> -	{ .id = 0x10de0003, .name = "MCP77/78 HDMI",
> -	  .patch = patch_nvhdmi_8ch_7x },
> -	{ .id = 0x10de0005, .name = "MCP77/78 HDMI",
> -	  .patch = patch_nvhdmi_8ch_7x },
> -	{ .id = 0x10de0006, .name = "MCP77/78 HDMI",
> -	  .patch = patch_nvhdmi_8ch_7x },
> -	{ .id = 0x10de0007, .name = "MCP79/7A HDMI",
> -	  .patch = patch_nvhdmi_8ch_7x },
> -	{ .id = 0x10de000a, .name = "GT220 HDMI",
> -	  .patch = patch_nvhdmi_8ch_89 },
> -	{ .id = 0x10de000b, .name = "GT21x HDMI",
> -	  .patch = patch_nvhdmi_8ch_89 },
> -	{ .id = 0x10de000c, .name = "MCP89 HDMI",
> -	  .patch = patch_nvhdmi_8ch_89 },
> -	{ .id = 0x10de000d, .name = "GT240 HDMI",
> -	  .patch = patch_nvhdmi_8ch_89 },
> -	{ .id = 0x10de0067, .name = "MCP67 HDMI", .patch = patch_nvhdmi_2ch },
> -	{ .id = 0x10de8001, .name = "MCP73 HDMI", .patch = patch_nvhdmi_2ch },
> +	{ .id = 0x10de0002, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
> +	{ .id = 0x10de0003, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
> +	{ .id = 0x10de0005, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
> +	{ .id = 0x10de0006, .name = "MCP77/78 HDMI",  .patch = patch_nvhdmi_8ch_7x },
> +	{ .id = 0x10de0007, .name = "MCP79/7A HDMI",  .patch = patch_nvhdmi_8ch_7x },
> +	{ .id = 0x10de000a, .name = "GPU 0a HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de000b, .name = "GPU 0b HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de000c, .name = "MCP89 HDMI",     .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de000d, .name = "GPU 0d HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0010, .name = "GPU 10 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0011, .name = "GPU 11 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0012, .name = "GPU 12 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0013, .name = "GPU 13 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0014, .name = "GPU 14 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0018, .name = "GPU 18 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0019, .name = "GPU 19 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de001a, .name = "GPU 1a HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de001b, .name = "GPU 1b HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de001c, .name = "GPU 1c HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0040, .name = "GPU 40 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0041, .name = "GPU 41 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0042, .name = "GPU 42 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0043, .name = "GPU 43 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0044, .name = "GPU 44 HDMI/DP", .patch = patch_nvhdmi_8ch_89 },
> +	{ .id = 0x10de0067, .name = "MCP67 HDMI",     .patch = patch_nvhdmi_2ch },
> +	{ .id = 0x10de8001, .name = "MCP73 HDMI",     .patch = patch_nvhdmi_2ch },
>  	{} /* terminator */
>  };
>  
> @@ -572,6 +578,21 @@ MODULE_ALIAS("snd-hda-codec-id:10de000a");
>  MODULE_ALIAS("snd-hda-codec-id:10de000b");
>  MODULE_ALIAS("snd-hda-codec-id:10de000c");
>  MODULE_ALIAS("snd-hda-codec-id:10de000d");
> +MODULE_ALIAS("snd-hda-codec-id:10de0010");
> +MODULE_ALIAS("snd-hda-codec-id:10de0011");
> +MODULE_ALIAS("snd-hda-codec-id:10de0012");
> +MODULE_ALIAS("snd-hda-codec-id:10de0013");
> +MODULE_ALIAS("snd-hda-codec-id:10de0014");
> +MODULE_ALIAS("snd-hda-codec-id:10de0018");
> +MODULE_ALIAS("snd-hda-codec-id:10de0019");
> +MODULE_ALIAS("snd-hda-codec-id:10de001a");
> +MODULE_ALIAS("snd-hda-codec-id:10de001b");
> +MODULE_ALIAS("snd-hda-codec-id:10de001c");
> +MODULE_ALIAS("snd-hda-codec-id:10de0040");
> +MODULE_ALIAS("snd-hda-codec-id:10de0041");
> +MODULE_ALIAS("snd-hda-codec-id:10de0042");
> +MODULE_ALIAS("snd-hda-codec-id:10de0043");
> +MODULE_ALIAS("snd-hda-codec-id:10de0044");
>  MODULE_ALIAS("snd-hda-codec-id:10de0067");
>  MODULE_ALIAS("snd-hda-codec-id:10de8001");
>  
> -- 
> 1.6.0.6
> 
> nvpublic
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>