]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ASoC: hdac_hdmi: remove cancel_work_sync in runtime suspend
authorBrent Lu <brent.lu@intel.com>
Wed, 15 Jul 2020 13:01:50 +0000 (21:01 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 2 Oct 2020 20:05:27 +0000 (21:05 +0100)
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: Brent Lu <brent.lu@intel.com>
Link: https://lore.kernel.org/r/1594818110-786-1-git-send-email-brent.lu@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/hdac_hdmi.c

index c61cce53f5137071b018b5d0f8e128cf130ce5cf..2c1305bf057228d3f90a56e7cad902bc934bcf93 100644 (file)
@@ -2235,8 +2235,6 @@ static int hdac_hdmi_runtime_suspend(struct device *dev)
        if (!bus)
                return 0;
 
-       clear_dapm_works(hdev);
-
        /*
         * Power down afg.
         * codec_read is preferred over codec_write to set the power state.