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

Commit 23ccc2bd authored by Wu Fengguang's avatar Wu Fengguang Committed by Takashi Iwai
Browse files

ALSA: intelhdmi - export monitor-presence and ELD-valid status 



Signed-off-by: default avatarWu Fengguang <fengguang.wu@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1e7c10fe

sound/pci/hda/hda_eld.c

+7 −1
Original line number Diff line number Diff line
@@ -477,6 +477,8 @@ static void hdmi_print_eld_info(struct snd_info_entry *entry, 
		[4 ... 7] = "reserved"

	};



	snd_iprintf(buffer, "monitor_present\t\t%d\n", e->monitor_present);

	snd_iprintf(buffer, "eld_valid\t\t%d\n", e->eld_valid);

	snd_iprintf(buffer, "monitor_name\t\t%s\n", e->monitor_name);

	snd_iprintf(buffer, "connection_type\t\t%s\n",

				eld_connection_type_names[e->conn_type]);
@@ -518,7 +520,11 @@ static void hdmi_write_eld_info(struct snd_info_entry *entry, 
		 * 	monitor_name manufacture_id product_id

		 * 	eld_version edid_version

		 */

		if (!strcmp(name, "connection_type"))

		if (!strcmp(name, "monitor_present"))

			e->monitor_present = val;

		else if (!strcmp(name, "eld_valid"))

			e->eld_valid = val;

		else if (!strcmp(name, "connection_type"))

			e->conn_type = val;

		else if (!strcmp(name, "port_id"))

			e->port_id = val;

sound/pci/hda/hda_local.h

+3 −1
Original line number Diff line number Diff line
@@ -569,9 +569,11 @@ struct cea_sad { 
 * ELD: EDID Like Data

 */

struct hdmi_eld {

	bool	monitor_present;

	bool	eld_valid;

	int	eld_size;

	int	baseline_len;

	int	eld_ver;	/* (eld_ver == 0) indicates invalid ELD */

	int	eld_ver;

	int	cea_edid_ver;

	char	monitor_name[ELD_MAX_MNL + 1];

	int	manufacture_id;

sound/pci/hda/patch_intelhdmi.c

+3 −5
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ struct intel_hdmi_spec { 
	/*

	 * HDMI sink attached to each pin

	 */

	bool		sink_present[INTEL_HDMI_PINS];

	bool		sink_eldv[INTEL_HDMI_PINS];

	struct hdmi_eld sink_eld[INTEL_HDMI_PINS];



	/*
@@ -645,7 +643,7 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec, hda_nid_t nid, 
	for (i = 0; i < spec->num_pins; i++) {

		if (spec->pin_cvt[i] != nid)

			continue;

		if (spec->sink_present[i] != true)

		if (!spec->sink_eld[i].monitor_present)

			continue;



		pin_nid = spec->pin[i];
@@ -675,8 +673,8 @@ static void hdmi_intrinsic_event(struct hda_codec *codec, unsigned int res) 
	if (index < 0)

		return;



	spec->sink_present[index] = pind;

	spec->sink_eldv[index] = eldv;

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

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



	if (pind && eldv) {

		hdmi_parse_eld(codec, index);