Commit 5c767fc6 authored May 06, 2019 by Hui Wang Committed by Greg Kroah-Hartman May 21, 2019

ALSA: hda/hdmi - Read the pin sense from register when repolling



commit 8c2e6728c2bf95765b724e07d0278ae97cd1ee0d upstream.

The driver will check the monitor presence when resuming from suspend,
starting poll or interrupt triggers. In these 3 situations, the
jack_dirty will be set to 1 first, then the hda_jack.c reads the
pin_sense from register, after reading the register, the jack_dirty
will be set to 0. But hdmi_repoll_work() is enabled in these 3
situations, It will read the pin_sense a couple of times subsequently,
since the jack_dirty is 0 now, It does not read the register anymore,
instead it uses the shadow pin_sense which is read at the first time.

It is meaningless to check the shadow pin_sense a couple of times,
we need to read the register to check the real plugging state, so
we set the jack_dirty to 1 in the hdmi_repoll_work().

Signed-off-by: Hui Wang <hui.wang@canonical.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f934bf3f

sound/pci/hda/patch_hdmi.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1554,6 +1554,11 @@ static void hdmi_repoll_eld(struct work_struct *work)
		container_of(to_delayed_work(work), struct hdmi_spec_per_pin, work);
		struct hda_codec *codec = per_pin->codec;
		struct hdmi_spec *spec = codec->spec;
		struct hda_jack_tbl *jack;

		jack = snd_hda_jack_tbl_get(codec, per_pin->pin_nid);
		if (jack)
		jack->jack_dirty = 1;

		if (per_pin->repoll_count++ > 6)
		per_pin->repoll_count = 0;