diff mbox series

[v3,2/2] ALSA: hda/realtek: call alc_update_headset_mode() in hp_automute_hook

Message ID 20210320091542.6748-2-hui.wang@canonical.com
State Accepted
Commit e54f30befa7990b897189b44a56c1138c6bfdbb5
Headers show
Series [v3,1/2] ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO | expand

Commit Message

Hui Wang March 20, 2021, 9:15 a.m. UTC
We found the alc_update_headset_mode() is not called on some machines
when unplugging the headset, as a result, the mode of the
ALC_HEADSET_MODE_UNPLUGGED can't be set, then the current_headset_type
is not cleared, if users plug a differnt type of headset next time,
the determine_headset_type() will not be called and the audio jack is
set to the headset type of previous time.

On the Dell machines which connect the dmic to the PCH, if we open
the gnome-sound-setting and unplug the headset, this issue will
happen. Those machines disable the auto-mute by ucm and has no
internal mic in the input source, so the update_headset_mode() will
not be called by cap_sync_hook or automute_hook when unplugging, and
because the gnome-sound-setting is opened, the codec will not enter
the runtime_suspend state, so the update_headset_mode() will not be
called by alc_resume when unplugging. In this case the
hp_automute_hook is called when unplugging, so add
update_headset_mode() calling to this function.

Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Takashi Iwai March 22, 2021, 11:20 a.m. UTC | #1
On Sat, 20 Mar 2021 10:15:42 +0100,
Hui Wang wrote:
> 
> We found the alc_update_headset_mode() is not called on some machines
> when unplugging the headset, as a result, the mode of the
> ALC_HEADSET_MODE_UNPLUGGED can't be set, then the current_headset_type
> is not cleared, if users plug a differnt type of headset next time,
> the determine_headset_type() will not be called and the audio jack is
> set to the headset type of previous time.
> 
> On the Dell machines which connect the dmic to the PCH, if we open
> the gnome-sound-setting and unplug the headset, this issue will
> happen. Those machines disable the auto-mute by ucm and has no
> internal mic in the input source, so the update_headset_mode() will
> not be called by cap_sync_hook or automute_hook when unplugging, and
> because the gnome-sound-setting is opened, the codec will not enter
> the runtime_suspend state, so the update_headset_mode() will not be
> called by alc_resume when unplugging. In this case the
> hp_automute_hook is called when unplugging, so add
> update_headset_mode() calling to this function.
> 
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hui Wang <hui.wang@canonical.com>

Applied, thanks.


Takashi
diff mbox series

Patch

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 442e555de44c..01d9d44aeec1 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5447,6 +5447,7 @@  static void alc_update_headset_jack_cb(struct hda_codec *codec,
 				       struct hda_jack_callback *jack)
 {
 	snd_hda_gen_hp_automute(codec, jack);
+	alc_update_headset_mode(codec);
 }
 
 static void alc_probe_headset_mode(struct hda_codec *codec)