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

Commit 38faddb1 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Fix pin-detection of Nvidia HDMI 



The behavior of Nvidia HDMI codec regarding the pin-detection unsol events
is based on the old HD-audio spec, i.e. PD bit indicates only the update
and doesn't show the current state.  Since the current code assumes the
new behavior, the pin-detection doesn't work relialby with these h/w.

This patch adds a flag for indicating the old spec, and fixes the issue
by checking the pin-detection explicitly for such hardware.

Tested-by: default avatarWei Ni <wni@nvidia.com>
Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ac0547dc

sound/pci/hda/patch_hdmi.c

+13 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ struct hdmi_spec { 
	 */

	struct hda_multi_out multiout;

	unsigned int codec_type;



	/* misc flags */

	/* PD bit indicates only the update, not the current state */

	unsigned int old_pin_detect:1;

};
@@ -616,6 +620,9 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid, 
 * Unsolicited events

 */



static void hdmi_present_sense(struct hda_codec *codec, hda_nid_t pin_nid,

			       struct hdmi_eld *eld);



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

{

	struct hdmi_spec *spec = codec->spec;
@@ -632,6 +639,12 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) 
	if (index < 0)

		return;



	if (spec->old_pin_detect) {

		if (pind)

			hdmi_present_sense(codec, tag, &spec->sink_eld[index]);

		pind = spec->sink_eld[index].monitor_present;

	}



	spec->sink_eld[index].monitor_present = pind;

	spec->sink_eld[index].eld_valid = eldv;

sound/pci/hda/patch_nvhdmi.c

+3 −0
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ static int patch_nvhdmi_8ch_89(struct hda_codec *codec) 


	codec->spec = spec;

	spec->codec_type = HDA_CODEC_NVIDIA_MCP89;

	spec->old_pin_detect = 1;



	if (hdmi_parse_codec(codec) < 0) {

		codec->spec = NULL;
@@ -508,6 +509,7 @@ static int patch_nvhdmi_8ch_7x(struct hda_codec *codec) 
	spec->multiout.max_channels = 8;

	spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;

	spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;

	spec->old_pin_detect = 1;



	codec->patch_ops = nvhdmi_patch_ops_8ch_7x;
@@ -528,6 +530,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec) 
	spec->multiout.max_channels = 2;

	spec->multiout.dig_out_nid = nvhdmi_master_con_nid_7x;

	spec->codec_type = HDA_CODEC_NVIDIA_MCP7X;

	spec->old_pin_detect = 1;



	codec->patch_ops = nvhdmi_patch_ops_2ch;