Commit 56c4299f authored Oct 01, 2022 by Takashi Iwai Committed by Greg Kroah-Hartman Oct 26, 2022

ALSA: hda/hdmi: Don't skip notification handling during PM operation

[ Upstream commit 5226c7b9784eee215e3914f440b3c2e1764f67a8 ]

The HDMI driver skips the notification handling from the graphics
driver when the codec driver is being in the PM operation. This
behavior was introduced by the commit eb399d3c ("ALSA: hda - Skip
ELD notification during PM process"). This skip may cause a problem,
as we may miss the ELD update when the connection/disconnection
happens right at the runtime-PM operation of the audio codec.

Although this workaround was valid at that time, it's no longer true;
the fix was required just because the ELD update procedure needed to
wake up the audio codec, which had lead to a runtime-resume during a
runtime-suspend. Meanwhile, the ELD update procedure doesn't need a
codec wake up any longer since the commit 788d441a ("ALSA: hda -
Use component ops for i915 HDMI/DP audio jack handling"); i.e. there
is no much reason for skipping the notification.

Let's drop those checks for addressing the missing notification.

Fixes: 788d441a ("ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling")
Reported-by: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/20220927135807.4097052-1-brent.lu@intel.com
Link: https://lore.kernel.org/r/20221001074809.7461-1-tiwai@suse.de

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 45387ca4

sound/pci/hda/patch_hdmi.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -2570,9 +2570,6 @@ static void generic_acomp_pin_eld_notify(void *audio_ptr, int port, int dev_id)
		*/
		if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND)
		return;
		/* ditto during suspend/resume process itself */
		if (snd_hdac_is_in_pm(&codec->core))
		return;

		check_presence_and_report(codec, pin_nid, dev_id);
		}
		@@ -2775,9 +2772,6 @@ static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe)
		*/
		if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND)
		return;
		/* ditto during suspend/resume process itself */
		if (snd_hdac_is_in_pm(&codec->core))
		return;

		snd_hdac_i915_set_bclk(&codec->bus->core);
		check_presence_and_report(codec, pin_nid, dev_id);