At Fri, 9 Sep 2011 01:31:58 -0700, Rimas Avizienis wrote:

Greetings,

I don't know what the protocol is around here for submitting patches, but I spent the evening hacking the snd_hda_intel ALSA driver (specifically alc882_quirks.c) to add support for the built in audio devices on the late 2010 Mac Pro (MacPro 5,1) and I figured I should get it out into the world before I get lazy.

Previously, the analog line out and optical digital I/Os worked if you specified the model=imac24 parameter when loading the module. However, the analog input and front headphone jack didn't. With this patch, all inputs and outputs seem to work properly and I've cleaned up the mixer interface (no source selection, no phantom inputs or outputs).

Hope someone finds this useful!

Thanks for the patch. It's good that you got some working status. But now currently we are in the process of reducing model quirks as much as possible and use the auto-parser instead. So, I'd like to avoid to apply the patch as is.

Could you figure out which pins correspond to which I/O actually? Then we can put rather a pin-config fixup table.

thanks,

Takashi

-Rimas

diff --git a/sound/pci/hda/alc882_quirks.c b/sound/pci/hda/alc882_quirks.c index 617d047..7f3e2cf 100644 --- a/sound/pci/hda/alc882_quirks.c +++ b/sound/pci/hda/alc882_quirks.c @@ -14,6 +14,7 @@ enum { ALC882_ASUS_A7J, ALC882_ASUS_A7M, ALC885_MACPRO,

•   ALC885_MACPRO5,
   ALC885_MBA21,
   ALC885_MBP3,
   ALC885_MB5,
  

@@ -546,6 +547,7 @@ static const hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 }; #define alc883_capsrc_nids alc882_capsrc_nids_alt static const hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 }; #define alc889_capsrc_nids alc882_capsrc_nids +static const hda_nid_t macpro5_adc_nids[1] = { 0x07 };

/* input MUX */ /* FIXME: should be a matrix-type input source selection */ @@ -1682,6 +1684,35 @@ static const struct snd_kcontrol_new alc885_imac24_mixer[] = { { } /* end */ };

+/* MacPro 5,1 init verbs. */ +static const struct hda_verb alc885_macpro5_init_verbs[] = {

•    /* Unmute inputs/outputs on mixer device */
  

•   {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
  

•   {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
  

•   {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
  

•   /* Rear line out: output 0 (0x14) */
  

•   {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT},
  

•   {0x14, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
  

•   {0x14, AC_VERB_SET_CONNECT_SEL, 0x00},
  

•   /* Front headphone out: output 0 (0x19) */
  

•   {0x19, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP | AC_PINCTL_VREF_80},
  

•   {0x19, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE},
  

•   {0x19, AC_VERB_SET_CONNECT_SEL, 0x00},
  

•   {0x19, AC_VERB_SET_UNSOLICITED_ENABLE, ALC_HP_EVENT | AC_USRSP_EN},
  

•   /* Rear line in: input 0 (0x1a) */
  

•   {0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN},
  

•   {0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE},
  

•   {0x1a, AC_VERB_SET_CONNECT_SEL, 0x00},
  

•    /* Set ADC input source to line in */
  

•    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)},
  

•    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(1)},
  

•    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(2)},
  

•    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)},
  

•    {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)},
  

•   { }
  

+};

/* iMac 24 init verbs. */ static const struct hda_verb alc885_imac24_init_verbs[] = { /* Internal speakers: output 0 (0x0c) */ @@ -2820,6 +2851,7 @@ static const char * const alc882_models[ALC882_MODEL_LAST] = { [ALC882_ASUS_A7J] = "asus-a7j", [ALC882_ASUS_A7M] = "asus-a7m", [ALC885_MACPRO] = "macpro",

•   [ALC885_MACPRO5]        = "macpro5",
   [ALC885_MB5]            = "mb5",
   [ALC885_MACMINI3]       = "macmini3",
   [ALC885_MBA21]          = "mba21",
  

@@ -3014,6 +3046,7 @@ static const struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x4000, "MacbookPro 5,1", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4600, "MacbookPro 5,2", ALC885_MB5), SND_PCI_QUIRK(0x106b, 0x4100, "Macmini 3,1", ALC885_MACMINI3),

•   SND_PCI_QUIRK(0x106b, 0x4200, "MacPro 5,1", ALC885_MACPRO5),
   {} /* terminator */
  

};

@@ -3135,6 +3168,20 @@ static const struct alc_config_preset alc882_presets[] = { .input_mux = &alc882_capture_source, .init_hook = alc885_macpro_init_hook, },

•   [ALC885_MACPRO5] = {
  

•           .mixers = { alc885_imac24_mixer },
  

•           .init_verbs = { alc885_macpro5_init_verbs },
  

•           .num_dacs = ARRAY_SIZE(alc882_dac_nids),
  

•           .dac_nids = alc882_dac_nids,
  

•           .num_adc_nids = ARRAY_SIZE(macpro5_adc_nids),
  

•           .adc_nids = macpro5_adc_nids,
  

•           .dig_out_nid = ALC882_DIGOUT_NID,
  

•           .dig_in_nid = ALC882_DIGIN_NID,
  

•           .num_channel_mode = ARRAY_SIZE(alc882_ch_modes),
  

•           .channel_mode = alc882_ch_modes,
  

•           .input_mux = 0,
  

•           .init_hook = alc885_macpro_init_hook,
  

•   },
   [ALC885_IMAC24] = {
           .mixers = { alc885_imac24_mixer },
           .init_verbs = { alc885_imac24_init_verbs },
  

---

Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel