mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

ALSA: hda - Fix ALC268 parser for mono speaker

Browse source 
- Parse the mono output pin 0x16 correctly even as the primary output
- Create "Speaker" volume control if the primary output is a speaker
- Fix the wrong direction of (optional) "Mono" switch

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2009-07-17 14:36:59 +02:00
parent 82e1b804b0
commit 3f3b7c1aed
1 changed files with 43 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
sound/pci/hda/patch_realtek.c
View file

@ -11816,26 +11816,38 @@ static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid,
const char *ctlname, int idx) const char *ctlname, int idx)
{ {
char name[32]; char name[32];
hda_nid_t dac;
int err; int err;
sprintf(name, "%s Playback Volume", ctlname); sprintf(name, "%s Playback Volume", ctlname);
if (nid == 0x14) { switch (nid) {
case 0x14:
case 0x16:
dac = 0x02;
break;
case 0x15:
dac = 0x03;
break;
default:
return 0;
}
if (spec->multiout.dac_nids[0] != dac &&
spec->multiout.dac_nids[1] != dac) {
err = add_control(spec, ALC_CTL_WIDGET_VOL, name, err = add_control(spec, ALC_CTL_WIDGET_VOL, name,
HDA_COMPOSE_AMP_VAL(0x02, 3, idx, HDA_COMPOSE_AMP_VAL(dac, 3, idx,
HDA_OUTPUT)); HDA_OUTPUT));
if (err < 0) if (err < 0)
return err; return err;
} else if (nid == 0x15) { spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac;
err = add_control(spec, ALC_CTL_WIDGET_VOL, name, }
HDA_COMPOSE_AMP_VAL(0x03, 3, idx,
HDA_OUTPUT));
if (err < 0)
return err;
} else
return -1;
sprintf(name, "%s Playback Switch", ctlname); sprintf(name, "%s Playback Switch", ctlname);
err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, if (nid != 0x16)
err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT)); HDA_COMPOSE_AMP_VAL(nid, 3, idx, HDA_OUTPUT));
else /* mono */
err = add_control(spec, ALC_CTL_WIDGET_MUTE, name,
HDA_COMPOSE_AMP_VAL(nid, 2, idx, HDA_OUTPUT));
if (err < 0) if (err < 0)
return err; return err;
return 0; return 0;
@ -11848,14 +11860,19 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
hda_nid_t nid; hda_nid_t nid;
int err; int err;
spec->multiout.num_dacs = 2; /* only use one dac */
spec->multiout.dac_nids = spec->private_dac_nids; spec->multiout.dac_nids = spec->private_dac_nids;
spec->multiout.dac_nids[0] = 2;
spec->multiout.dac_nids[1] = 3;
nid = cfg->line_out_pins[0]; nid = cfg->line_out_pins[0];
if (nid) if (nid) {
alc268_new_analog_output(spec, nid, "Front", 0); const char *name;
if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT)
name = "Speaker";
else
name = "Front";
err = alc268_new_analog_output(spec, nid, name, 0);
if (err < 0)
return err;
}
nid = cfg->speaker_pins[0]; nid = cfg->speaker_pins[0];
if (nid == 0x1d) { if (nid == 0x1d) {
@ -11864,16 +11881,23 @@ static int alc268_auto_create_multi_out_ctls(struct alc_spec *spec,
HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT)); HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_INPUT));
if (err < 0) if (err < 0)
return err; return err;
} else {
err = alc268_new_analog_output(spec, nid, "Speaker", 0);
if (err < 0)
return err;
} }
nid = cfg->hp_pins[0]; nid = cfg->hp_pins[0];
if (nid) if (nid) {
alc268_new_analog_output(spec, nid, "Headphone", 0); err = alc268_new_analog_output(spec, nid, "Headphone", 0);
if (err < 0)
return err;
}
nid = cfg->line_out_pins[1] | cfg->line_out_pins[2]; nid = cfg->line_out_pins[1] | cfg->line_out_pins[2];
if (nid == 0x16) { if (nid == 0x16) {
err = add_control(spec, ALC_CTL_WIDGET_MUTE, err = add_control(spec, ALC_CTL_WIDGET_MUTE,
"Mono Playback Switch", "Mono Playback Switch",
HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_INPUT)); HDA_COMPOSE_AMP_VAL(nid, 2, 0, HDA_OUTPUT));
if (err < 0) if (err < 0)
return err; return err;
} }