Merge branch 'master' of git://git.alsa-project.org/alsa-kernel into for-linus

[safe/jmp/linux-2.6] / sound / pci / hda / patch_atihdmi.c

diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
index 27d2e00..233e477 100644 (file)
--- a/sound/pci/hda/patch_atihdmi.c
+++ b/sound/pci/hda/patch_atihdmi.c
@@ -34,6 +34,9 @@ struct atihdmi_spec {
        struct hda_pcm pcm_rec;
 };
 
+#define CVT_NID                0x02    /* audio converter */
+#define PIN_NID                0x03    /* HDMI output pin */
+
 static struct hda_verb atihdmi_basic_init[] = {
        /* enable digital output on pin widget */
        { 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
@@ -59,8 +62,9 @@ static int atihdmi_init(struct hda_codec *codec)
 {
        snd_hda_sequence_write(codec, atihdmi_basic_init);
        /* SI codec requires to unmute the pin */
-       if (get_wcaps(codec, 0x03) & AC_WCAP_OUT_AMP)
-               snd_hda_codec_write(codec, 0x03, 0, AC_VERB_SET_AMP_GAIN_MUTE,
+       if (get_wcaps(codec, PIN_NID) & AC_WCAP_OUT_AMP)
+               snd_hda_codec_write(codec, PIN_NID, 0,
+                                   AC_VERB_SET_AMP_GAIN_MUTE,
                                    AMP_OUT_UNMUTE);
        return 0;
 }
@@ -91,15 +95,29 @@ static int atihdmi_dig_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
                                            struct snd_pcm_substream *substream)
 {
        struct atihdmi_spec *spec = codec->spec;
-       return snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
-                                            format, substream);
+       int chans = substream->runtime->channels;
+       int i, err;
+
+       err = snd_hda_multi_out_dig_prepare(codec, &spec->multiout, stream_tag,
+                                           format, substream);
+       if (err < 0)
+               return err;
+       snd_hda_codec_write(codec, CVT_NID, 0, AC_VERB_SET_CVT_CHAN_COUNT,
+                           chans - 1);
+       /* FIXME: XXX */
+       for (i = 0; i < chans; i++) {
+               snd_hda_codec_write(codec, CVT_NID, 0,
+                                   AC_VERB_SET_HDMI_CHAN_SLOT,
+                                   (i << 4) | i);
+       }
+       return 0;
 }
 
 static struct hda_pcm_stream atihdmi_pcm_digital_playback = {
        .substreams = 1,
        .channels_min = 2,
        .channels_max = 2,
-       .nid = 0x2, /* NID to query formats and rates and setup streams */
+       .nid = CVT_NID, /* NID to query formats and rates and setup streams */
        .ops = {
                .open = atihdmi_dig_playback_pcm_open,
                .close = atihdmi_dig_playback_pcm_close,
@@ -111,13 +129,22 @@ static int atihdmi_build_pcms(struct hda_codec *codec)
 {
        struct atihdmi_spec *spec = codec->spec;
        struct hda_pcm *info = &spec->pcm_rec;
+       unsigned int chans;
 
        codec->num_pcms = 1;
        codec->pcm_info = info;
 
        info->name = "ATI HDMI";
+       info->pcm_type = HDA_PCM_TYPE_HDMI;
        info->stream[SNDRV_PCM_STREAM_PLAYBACK] = atihdmi_pcm_digital_playback;
 
+       /* FIXME: we must check ELD and change the PCM parameters dynamically
+        */
+       chans = get_wcaps(codec, CVT_NID);
+       chans = (chans & AC_WCAP_CHAN_CNT_EXT) >> 13;
+       chans = ((chans << 1) | 1) + 1;
+       info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = chans;
+
        return 0;
 }
 
@@ -145,9 +172,11 @@ static int patch_atihdmi(struct hda_codec *codec)
 
        spec->multiout.num_dacs = 0;      /* no analog */
        spec->multiout.max_channels = 2;
-       spec->multiout.dig_out_nid = 0x2; /* NID for copying analog to digital,
-                                          * seems to be unused in pure-digital
-                                          * case. */
+       /* NID for copying analog to digital,
+        * seems to be unused in pure-digital
+        * case.
+        */
+       spec->multiout.dig_out_nid = CVT_NID;
 
        codec->patch_ops = atihdmi_patch_ops;
 
@@ -157,11 +186,40 @@ static int patch_atihdmi(struct hda_codec *codec)
 /*
  * patch entries
  */
-struct hda_codec_preset snd_hda_preset_atihdmi[] = {
-       { .id = 0x1002793c, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
-       { .id = 0x10027919, .name = "ATI RS600 HDMI", .patch = patch_atihdmi },
-       { .id = 0x1002791a, .name = "ATI RS690/780 HDMI", .patch = patch_atihdmi },
-       { .id = 0x1002aa01, .name = "ATI R6xx HDMI", .patch = patch_atihdmi },
-       { .id = 0x10951392, .name = "SI HDMI", .patch = patch_atihdmi },
+static struct hda_codec_preset snd_hda_preset_atihdmi[] = {
+       { .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
+       { .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
+       { .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },
+       { .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi },
+       { .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_atihdmi },
+       { .id = 0x17e80047, .name = "Chrontel HDMI",  .patch = patch_atihdmi },
        {} /* terminator */
 };
+
+MODULE_ALIAS("snd-hda-codec-id:1002793c");
+MODULE_ALIAS("snd-hda-codec-id:10027919");
+MODULE_ALIAS("snd-hda-codec-id:1002791a");
+MODULE_ALIAS("snd-hda-codec-id:1002aa01");
+MODULE_ALIAS("snd-hda-codec-id:10951390");
+MODULE_ALIAS("snd-hda-codec-id:17e80047");
+
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("ATI HDMI HD-audio codec");
+
+static struct hda_codec_preset_list atihdmi_list = {
+       .preset = snd_hda_preset_atihdmi,
+       .owner = THIS_MODULE,
+};
+
+static int __init patch_atihdmi_init(void)
+{
+       return snd_hda_add_codec_preset(&atihdmi_list);
+}
+
+static void __exit patch_atihdmi_exit(void)
+{
+       snd_hda_delete_codec_preset(&atihdmi_list);
+}
+
+module_init(patch_atihdmi_init)
+module_exit(patch_atihdmi_exit)