Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133051
b: refs/heads/master
c: 6a05ac4
h: refs/heads/master
i:
  133049: 111c8ba
  133047: 8ff3d55
v: v3
  • Loading branch information
Takashi Iwai committed Feb 13, 2009
1 parent 251a20d commit d49e043
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b5f12e5a4029c1cd03784754687faef6d9e54fa
refs/heads/master: 6a05ac4afa90ac9c38fedd3f6940fe8da5d1fcf6
22 changes: 19 additions & 3 deletions trunk/sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ struct alc_spec {
* dig_out_nid and hp_nid are optional
*/
hda_nid_t alt_dac_nid;
hda_nid_t slave_dig_outs[3]; /* optional - for auto-parsing */
int dig_out_type;

/* capture */
Expand Down Expand Up @@ -4269,7 +4270,7 @@ static void alc880_auto_init_analog_input(struct hda_codec *codec)
static int alc880_parse_auto_config(struct hda_codec *codec)
{
struct alc_spec *spec = codec->spec;
int err;
int i, err;
static hda_nid_t alc880_ignore[] = { 0x1d, 0 };

err = snd_hda_parse_pin_def_config(codec, &spec->autocfg,
Expand Down Expand Up @@ -4300,8 +4301,23 @@ static int alc880_parse_auto_config(struct hda_codec *codec)

spec->multiout.max_channels = spec->multiout.num_dacs * 2;

if (spec->autocfg.dig_outs)
spec->multiout.dig_out_nid = ALC880_DIGOUT_NID;
/* check multiple SPDIF-out (for recent codecs) */
for (i = 0; i < spec->autocfg.dig_outs; i++) {
hda_nid_t dig_nid;
err = snd_hda_get_connections(codec,
spec->autocfg.dig_out_pins[i],
&dig_nid, 1);
if (err < 0)
continue;
if (!i)
spec->multiout.dig_out_nid = dig_nid;
else {
spec->multiout.slave_dig_outs = spec->slave_dig_outs;
spec->slave_dig_outs[i - 1] = dig_nid;
if (i == ARRAY_SIZE(spec->slave_dig_outs) - 1)
break;
}
}
if (spec->autocfg.dig_in_pin)
spec->dig_in_nid = ALC880_DIGIN_NID;

Expand Down

0 comments on commit d49e043

Please sign in to comment.