Commit 7fe30711 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix inconsistent Mic mute LED 



The current code for controlling mic mute LED in patch_sigmatel.c
blindly assumes that there is a single capture switch.  But, there can
be multiple multiple ones, and each of them flips the state, ended up
in an inconsistent state.

For fixing this problem, this patch adds kcontrol to be passed to the
hook function so that the callee can check which switch is being
accessed.  In stac_capture_led_hook(), the state is checked as a
bitmask, and turns on the LED when all capture switches are off.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f8f1becf

sound/pci/hda/hda_generic.c

+4 −4
Original line number Diff line number Diff line
@@ -3269,7 +3269,7 @@ static int cap_put_caller(struct snd_kcontrol *kcontrol, 
	mutex_unlock(&codec->control_mutex);

	snd_hda_codec_flush_cache(codec); /* flush the updates */

	if (err >= 0 && spec->cap_sync_hook)

		spec->cap_sync_hook(codec, ucontrol);

		spec->cap_sync_hook(codec, kcontrol, ucontrol);

	return err;

}
@@ -3390,7 +3390,7 @@ static int cap_single_sw_put(struct snd_kcontrol *kcontrol, 
		return ret;



	if (spec->cap_sync_hook)

		spec->cap_sync_hook(codec, ucontrol);

		spec->cap_sync_hook(codec, kcontrol, ucontrol);



	return ret;

}
@@ -3795,7 +3795,7 @@ static int mux_select(struct hda_codec *codec, unsigned int adc_idx, 
		return 0;

	snd_hda_activate_path(codec, path, true, false);

	if (spec->cap_sync_hook)

		spec->cap_sync_hook(codec, NULL);

		spec->cap_sync_hook(codec, NULL, NULL);

	path_power_down_sync(codec, old_path);

	return 1;

}
@@ -5270,7 +5270,7 @@ static void init_input_src(struct hda_codec *codec) 
	}



	if (spec->cap_sync_hook)

		spec->cap_sync_hook(codec, NULL);

		spec->cap_sync_hook(codec, NULL, NULL);

}



/* set right pin controls for digital I/O */

sound/pci/hda/hda_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ struct hda_gen_spec { 
	void (*init_hook)(struct hda_codec *codec);

	void (*automute_hook)(struct hda_codec *codec);

	void (*cap_sync_hook)(struct hda_codec *codec,

			      struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol);



	/* PCM hooks */

sound/pci/hda/patch_conexant.c

+2 −1
Original line number Diff line number Diff line
@@ -3291,6 +3291,7 @@ static void cxt_update_headset_mode(struct hda_codec *codec) 
}



static void cxt_update_headset_mode_hook(struct hda_codec *codec,

					 struct snd_kcontrol *kcontrol,

					 struct snd_ctl_elem_value *ucontrol)

{

	cxt_update_headset_mode(codec);

sound/pci/hda/patch_realtek.c

+6 −3
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ static void alc_inv_dmic_sync(struct hda_codec *codec, bool force) 
}



static void alc_inv_dmic_hook(struct hda_codec *codec,

			      struct snd_kcontrol *kcontrol,

			      struct snd_ctl_elem_value *ucontrol)

{

	alc_inv_dmic_sync(codec, false);
@@ -3218,6 +3219,7 @@ static void alc269_fixup_hp_gpio_mute_hook(void *private_data, int enabled) 


/* turn on/off mic-mute LED per capture hook */

static void alc269_fixup_hp_gpio_mic_mute_hook(struct hda_codec *codec,

					       struct snd_kcontrol *kcontrol,

					       struct snd_ctl_elem_value *ucontrol)

{

	struct alc_spec *spec = codec->spec;
@@ -3528,6 +3530,7 @@ static void alc_update_headset_mode(struct hda_codec *codec) 
}



static void alc_update_headset_mode_hook(struct hda_codec *codec,

					 struct snd_kcontrol *kcontrol,

					 struct snd_ctl_elem_value *ucontrol)

{

	alc_update_headset_mode(codec);

sound/pci/hda/patch_sigmatel.c

+17 −10
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ struct sigmatel_spec { 
	int default_polarity;



	unsigned int mic_mute_led_gpio; /* capture mute LED GPIO */

	bool mic_mute_led_on; /* current mic mute state */

	unsigned int mic_enabled; /* current mic mute state (bitmask) */



	/* stream */

	unsigned int stream_delay;
@@ -324,19 +324,26 @@ static void stac_gpio_set(struct hda_codec *codec, unsigned int mask, 


/* hook for controlling mic-mute LED GPIO */

static void stac_capture_led_hook(struct hda_codec *codec,

				  struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol)

{

	struct sigmatel_spec *spec = codec->spec;

	bool mute;

	unsigned int mask;

	bool cur_mute, prev_mute;



	if (!ucontrol)

	if (!kcontrol || !ucontrol)

		return;



	mute = !(ucontrol->value.integer.value[0] ||

		 ucontrol->value.integer.value[1]);

	if (spec->mic_mute_led_on != mute) {

		spec->mic_mute_led_on = mute;

		if (mute)

	mask = 1U << snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);

	prev_mute = !spec->mic_enabled;

	if (ucontrol->value.integer.value[0] ||

	    ucontrol->value.integer.value[1])

		spec->mic_enabled |= mask;

	else

		spec->mic_enabled &= ~mask;

	cur_mute = !spec->mic_enabled;

	if (cur_mute != prev_mute) {

		if (cur_mute)

			spec->gpio_data |= spec->mic_mute_led_gpio;

		else

			spec->gpio_data &= ~spec->mic_mute_led_gpio;
@@ -4462,7 +4469,7 @@ static void stac_setup_gpio(struct hda_codec *codec) 
	if (spec->mic_mute_led_gpio) {

		spec->gpio_mask |= spec->mic_mute_led_gpio;

		spec->gpio_dir |= spec->mic_mute_led_gpio;

		spec->mic_mute_led_on = true;

		spec->mic_enabled = 0;

		spec->gpio_data |= spec->mic_mute_led_gpio;



		spec->gen.cap_sync_hook = stac_capture_led_hook;

CRA Git | Maintained and supported by SUSTech CRA and CCSE