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

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

ALSA: hda - fail ELD reading early 



With the ELD repoll mechanism, we can (and should) fail the ELD reading
immediately when find something obviously wrong and let the caller retry
after some delay.

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

sound/pci/hda/hda_eld.c

+19 −9
Original line number Diff line number Diff line
@@ -347,18 +347,28 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, 


	for (i = 0; i < size; i++) {

		unsigned int val = hdmi_get_eld_data(codec, nid, i);

		/*

		 * Graphics driver might be writing to ELD buffer right now.

		 * Just abort. The caller will repoll after a while.

		 */

		if (!(val & AC_ELDD_ELD_VALID)) {

			if (!i) {

			snd_printd(KERN_INFO

					   "HDMI: invalid ELD data\n");

				  "HDMI: invalid ELD data byte %d\n", i);

			ret = -EINVAL;

			goto error;

		}

			snd_printd(KERN_INFO

				  "HDMI: invalid ELD data byte %d\n", i);

			val = 0;

		} else

		val &= AC_ELDD_ELD_DATA;

		/*

		 * The first byte cannot be zero. This can happen on some DVI

		 * connections. Some Intel chips may also need some 250ms delay

		 * to return non-zero ELD data, even when the graphics driver

		 * correctly writes ELD content before setting ELD_valid bit.

		 */

		if (!val && !i) {

			snd_printdd(KERN_INFO "HDMI: 0 ELD data\n");

			ret = -EINVAL;

			goto error;

		}

		buf[i] = val;

	}