Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da4a7a39 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: hda - Explicitly keep codec powered up in hdmi_present_sense 



This should help us avoid the following mutex deadlock:

[] mutex_lock+0x2a/0x50
[] hdmi_present_sense+0x53/0x3a0 [snd_hda_codec_hdmi]
[] generic_hdmi_resume+0x5a/0x70 [snd_hda_codec_hdmi]
[] hda_call_codec_resume+0xec/0x1d0 [snd_hda_codec]
[] snd_hda_power_save+0x1e4/0x280 [snd_hda_codec]
[] codec_exec_verb+0x5f/0x290 [snd_hda_codec]
[] snd_hda_codec_read+0x5b/0x90 [snd_hda_codec]
[] snd_hdmi_get_eld_size+0x1e/0x20 [snd_hda_codec_hdmi]
[] snd_hdmi_get_eld+0x2c/0xd0 [snd_hda_codec_hdmi]
[] hdmi_present_sense+0x9a/0x3a0 [snd_hda_codec_hdmi]
[] hdmi_repoll_eld+0x34/0x50 [snd_hda_codec_hdmi]

Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f0e9c080

sound/pci/hda/patch_hdmi.c

+5 −1
Original line number Diff line number Diff line
@@ -1496,11 +1496,14 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) 
	 * specification worked this way. Hence, we just ignore the data in

	 * the unsolicited response to avoid custom WARs.

	 */

	int present = snd_hda_pin_sense(codec, pin_nid);

	int present;

	bool update_eld = false;

	bool eld_changed = false;

	bool ret;



	snd_hda_power_up(codec);

	present = snd_hda_pin_sense(codec, pin_nid);



	mutex_lock(&per_pin->lock);

	pin_eld->monitor_present = !!(present & AC_PINSENSE_PRESENCE);

	if (pin_eld->monitor_present)
@@ -1573,6 +1576,7 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) 
		jack->block_report = !ret;



	mutex_unlock(&per_pin->lock);

	snd_hda_power_down(codec);

	return ret;

}