lkml.org 
[lkml]   [2010]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[061/129] ALSA: hda - patch_nvhdmi.c: Add missing codec IDs, unify names
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Stephen Warren <swarren@nvidia.com>

    commit 9cf2657d05f9f9e04c3e113d68bf7cef5a942070 upstream.

    * 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@nvidia.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/pci/hda/patch_nvhdmi.c | 61 ++++++++++++++++++++++++++++---------------
    1 file changed, 41 insertions(+), 20 deletions(-)

    --- a/sound/pci/hda/patch_nvhdmi.c
    +++ b/sound/pci/hda/patch_nvhdmi.c
    @@ -541,26 +541,32 @@ static int patch_nvhdmi_2ch(struct hda_c
    * 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 */
    };

    @@ -573,6 +579,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");




    \
     
     \ /
      Last update: 2010-09-18 21:31    [W:0.023 / U:0.228 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site