Skip to content

Commit 5226c7b

Browse files
committed
ALSA: hda/hdmi: Don't skip notification handling during PM operation
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 eb399d3 ("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 788d441 ("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: 788d441 ("ALSA: hda - Use component ops for i915 HDMI/DP audio jack handling") Reported-by: Brent Lu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 6382da0 commit 5226c7b

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

sound/pci/hda/patch_hdmi.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2666,9 +2666,6 @@ static void generic_acomp_pin_eld_notify(void *audio_ptr, int port, int dev_id)
26662666
*/
26672667
if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND)
26682668
return;
2669-
/* ditto during suspend/resume process itself */
2670-
if (snd_hdac_is_in_pm(&codec->core))
2671-
return;
26722669

26732670
check_presence_and_report(codec, pin_nid, dev_id);
26742671
}
@@ -2852,9 +2849,6 @@ static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe)
28522849
*/
28532850
if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND)
28542851
return;
2855-
/* ditto during suspend/resume process itself */
2856-
if (snd_hdac_is_in_pm(&codec->core))
2857-
return;
28582852

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

0 commit comments

Comments
 (0)