Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 863b45180ef541a1990e4986d30fb7a93022a733

Authored by Takashi Iwai
1 parent ec4e86ba06
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ALSA: hda - Fix conflicting volume controls on ALC260 

ALC260 auto-parsing mode may create multiple controls for the same volume
widget (0x08 and 0x09) depending on the pin.  For example, Front and
Headphone volumes may control the same volume, just the latter one wins.

This patch adds a proper check of the existing of the volume control
and avoid the doulbed creation of the same volume controls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 14 additions and 8 deletions Side-by-side Diff

sound/pci/hda/patch_realtek.c
Diff comments   View file @ 863b451
... ... @@ -4996,7 +4996,7 @@
4996 4996 */
4997 4997  
4998 4998 static int alc260_add_playback_controls(struct alc_spec *spec, hda_nid_t nid,
4999   - const char *pfx)
  4999 + const char *pfx, int *vol_bits)
5000 5000 {
5001 5001 hda_nid_t nid_vol;
5002 5002 unsigned long vol_val, sw_val;
... ... @@ -5018,10 +5018,14 @@
5018 5018 } else
5019 5019 return 0; /* N/A */
5020 5020  
5021   - snprintf(name, sizeof(name), "%s Playback Volume", pfx);
5022   - err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val);
5023   - if (err < 0)
5024   - return err;
  5021 + if (!(*vol_bits & (1 << nid_vol))) {
  5022 + /* first control for the volume widget */
  5023 + snprintf(name, sizeof(name), "%s Playback Volume", pfx);
  5024 + err = add_control(spec, ALC_CTL_WIDGET_VOL, name, vol_val);
  5025 + if (err < 0)
  5026 + return err;
  5027 + *vol_bits |= (1 << nid_vol);
  5028 + }
5025 5029 snprintf(name, sizeof(name), "%s Playback Switch", pfx);
5026 5030 err = add_control(spec, ALC_CTL_WIDGET_MUTE, name, sw_val);
5027 5031 if (err < 0)
... ... @@ -5035,6 +5039,7 @@
5035 5039 {
5036 5040 hda_nid_t nid;
5037 5041 int err;
  5042 + int vols = 0;
5038 5043  
5039 5044 spec->multiout.num_dacs = 1;
5040 5045 spec->multiout.dac_nids = spec->private_dac_nids;
5041 5046  
5042 5047  
... ... @@ -5042,21 +5047,22 @@
5042 5047  
5043 5048 nid = cfg->line_out_pins[0];
5044 5049 if (nid) {
5045   - err = alc260_add_playback_controls(spec, nid, "Front");
  5050 + err = alc260_add_playback_controls(spec, nid, "Front", &vols);
5046 5051 if (err < 0)
5047 5052 return err;
5048 5053 }
5049 5054  
5050 5055 nid = cfg->speaker_pins[0];
5051 5056 if (nid) {
5052   - err = alc260_add_playback_controls(spec, nid, "Speaker");
  5057 + err = alc260_add_playback_controls(spec, nid, "Speaker", &vols);
5053 5058 if (err < 0)
5054 5059 return err;
5055 5060 }
5056 5061  
5057 5062 nid = cfg->hp_pins[0];
5058 5063 if (nid) {
5059   - err = alc260_add_playback_controls(spec, nid, "Headphone");
  5064 + err = alc260_add_playback_controls(spec, nid, "Headphone",
  5065 + &vols);
5060 5066 if (err < 0)
5061 5067 return err;
5062 5068 }