| From 6a5f6ccd5dea6e0baa06e824e033576d3ad027f6 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 28 Apr 2020 15:38:36 +0300 |
| Subject: ALSA: hda/hdmi: fix race in monitor detection during probe |
| |
| From: Kai Vehmanen <kai.vehmanen@linux.intel.com> |
| |
| [ Upstream commit ca76282b6faffc83601c25bd2a95f635c03503ef ] |
| |
| A race exists between build_pcms() and build_controls() phases of codec |
| setup. Build_pcms() sets up notifier for jack events. If a monitor event |
| is received before build_controls() is run, the initial jack state is |
| lost and never reported via mixer controls. |
| |
| The problem can be hit at least with SOF as the controller driver. SOF |
| calls snd_hda_codec_build_controls() in its workqueue-based probe and |
| this can be delayed enough to hit the race condition. |
| |
| Fix the issue by invalidating the per-pin ELD information when |
| build_controls() is called. The existing call to hdmi_present_sense() |
| will update the ELD contents. This ensures initial monitor state is |
| correctly reflected via mixer controls. |
| |
| BugLink: https://github.com/thesofproject/linux/issues/1687 |
| Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> |
| Link: https://lore.kernel.org/r/20200428123836.24512-1-kai.vehmanen@linux.intel.com |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/pci/hda/patch_hdmi.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c |
| index 0c1a59d5ad59d..0f3250417b955 100644 |
| --- a/sound/pci/hda/patch_hdmi.c |
| +++ b/sound/pci/hda/patch_hdmi.c |
| @@ -2320,7 +2320,9 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) |
| |
| for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { |
| struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); |
| + struct hdmi_eld *pin_eld = &per_pin->sink_eld; |
| |
| + pin_eld->eld_valid = false; |
| hdmi_present_sense(per_pin, 0); |
| } |
| |
| -- |
| 2.20.1 |
| |
