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

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

ALSA: hda - Fix missing ELD info when using jackpoll_ms parameter 



In the case of using jackpoll_ms instead of unsol events, the jack
was correctly detected, but ELD info was not refreshed on plug-in.

And without ELD info, no proper restriction of pcm, which can in turn
break sound output on some devices.

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

sound/pci/hda/patch_hdmi.c

+15 −12
Original line number Diff line number Diff line
@@ -1142,32 +1142,34 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, 


static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll);



static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)

static void jack_callback(struct hda_codec *codec, struct hda_jack_tbl *jack)

{

	struct hdmi_spec *spec = codec->spec;

	int pin_idx = pin_nid_to_pin_index(spec, jack->nid);

	if (pin_idx < 0)

		return;



	if (hdmi_present_sense(get_pin(spec, pin_idx), 1))

		snd_hda_jack_report_sync(codec);

}



static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res)

{

	int tag = res >> AC_UNSOL_RES_TAG_SHIFT;

	int pin_nid;

	int pin_idx;

	struct hda_jack_tbl *jack;

	int dev_entry = (res & AC_UNSOL_RES_DE) >> AC_UNSOL_RES_DE_SHIFT;



	jack = snd_hda_jack_tbl_get_from_tag(codec, tag);

	if (!jack)

		return;

	pin_nid = jack->nid;

	jack->jack_dirty = 1;



	_snd_printd(SND_PR_VERBOSE,

		"HDMI hot plug event: Codec=%d Pin=%d Device=%d Inactive=%d Presence_Detect=%d ELD_Valid=%d\n",

		codec->addr, pin_nid, dev_entry, !!(res & AC_UNSOL_RES_IA),

		codec->addr, jack->nid, dev_entry, !!(res & AC_UNSOL_RES_IA),

		!!(res & AC_UNSOL_RES_PD), !!(res & AC_UNSOL_RES_ELDV));



	pin_idx = pin_nid_to_pin_index(spec, pin_nid);

	if (pin_idx < 0)

		return;



	if (hdmi_present_sense(get_pin(spec, pin_idx), 1))

		snd_hda_jack_report_sync(codec);

	jack_callback(codec, jack);

}



static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
@@ -2095,7 +2097,8 @@ static int generic_hdmi_init(struct hda_codec *codec) 
		hda_nid_t pin_nid = per_pin->pin_nid;



		hdmi_init_pin(codec, pin_nid);

		snd_hda_jack_detect_enable(codec, pin_nid, pin_nid);

		snd_hda_jack_detect_enable_callback(codec, pin_nid, pin_nid,

			codec->jackpoll_interval > 0 ? jack_callback : NULL);

	}

	return 0;

}