Commit cec6e41c authored by Brent Lu's avatar Brent Lu Committed by Mark Brown

ASoC: hdac_hdmi: remove cancel_work_sync in runtime suspend

A deadlock is identified when there are three contexts running at the
same time:
- a HDMI jack work which is calling snd_soc_dapm_sync().
- user space is calling snd_pcm_release() to close pcm device.
- pm is calling runtime suspend function of HDMI codec driver.

By removing the clear_dapm_works() invocation in the
hdac_hdmi_runtime_suspend() function, the snd_pcm_release() could
always returns from dapm_power_widgets() function call without
blocking the hdac_hdmi_jack_dapm_work() work thread or being blocked
by the hdac_hdmi_runtime_suspend() function. The purpose of the jack
work is to enable/disable the dapm jack pin so it's not necessary to
cancel the work in runtime suspend function which is usually called
when pcm device is closed.
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/1594818110-786-1-git-send-email-brent.lu@intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1a4c450e
...@@ -2235,8 +2235,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev) ...@@ -2235,8 +2235,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
if (!bus) if (!bus)
return 0; return 0;
clear_dapm_works(hdev);
/* /*
* Power down afg. * Power down afg.
* codec_read is preferred over codec_write to set the power state. * codec_read is preferred over codec_write to set the power state.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment