diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:59:23 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 17:00:37 +0100 |
| commit | f37bc7a88d374448a1f4bba9267d308606d78bf2 (patch) | |
| tree | 00d1142a082adce61d52a15ad543852af391c1a1 /sound/pci/hda/patch_cirrus.c | |
| parent | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (diff) | |
| download | linux-3.10-f37bc7a88d374448a1f4bba9267d308606d78bf2.tar.gz linux-3.10-f37bc7a88d374448a1f4bba9267d308606d78bf2.tar.bz2 linux-3.10-f37bc7a88d374448a1f4bba9267d308606d78bf2.zip | |
ALSA: hda - Give standard "Bass Speaker" mixer for 2.1 speakers
When two built-in speakers are found on the machine, we can suppose
it's rather a 2.1 speaker system with a bass output instead of
front/surround channels.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index b9039dbd704..794b0da1121 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -68,6 +68,7 @@ struct cs_spec { unsigned int hp_detect:1; unsigned int mic_detect:1; + unsigned int speaker_2_1:1; /* CS421x */ unsigned int spdif_detect:1; unsigned int sense_b:1; @@ -443,6 +444,9 @@ static int parse_output(struct hda_codec *codec) spec->multiout.dac_nids = spec->dac_nid; spec->multiout.max_channels = i * 2; + if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT && i == 2) + spec->speaker_2_1 = 1; /* assume 2.1 speakers */ + /* add HP and speakers */ extra_nids = 0; for (i = 0; i < cfg->hp_outs; i++) { @@ -632,7 +636,9 @@ static int add_output(struct hda_codec *codec, hda_nid_t dac, int idx, index = idx; break; case AUTO_PIN_SPEAKER_OUT: - if (num_ctls > 1) + if (spec->speaker_2_1) + name = idx ? "Bass Speaker" : "Speaker"; + else if (num_ctls > 1) name = speakers[idx]; else name = "Speaker"; |