ALSA: hda - Handle pm failure during hotplug
PATCH v2 1/1 ALSA: hda - Handle pm failure during hotplug
From: Chris Wilson <[email protected]>
Obtaining the runtime pm wakeref can fail, especially in a hotplug scenario where i915.ko has been unloaded. If we do not catch the failure, we end up with an unbalanced pm.
[ Additional changes:
hdmi_present_sense() checks the return value and handle only a negative error case and bails out only if it's really still suspended. Also, snd_hda_power_down() is called at the error path so that the refcount is balanced.
Along with it, the spec->pcm_lock is taken outside hdmi_present_sense() in the caller side, so that it won't cause deadlock at reentrace via runtime resume. -- tiwai ]
References: 222bde03881c ("ALSA: hda - Fix mutex deadlock at HDMI/DP hotplug")
--- sound/pci/hda/patch_hdmi.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
sound/pci/hda/patch_hdmi.c +13 -5
@@ -764,8 +764,10 @@ static void check_presence_and_report(struct hda_codec *codec, hda_nid_t nid,if (pin_idx <0 )return ; +mutex_lock (&spec->pcm_lock);if (hdmi_present_sense (get_pin (spec, pin_idx),1 ))snd_hda_jack_report_sync (codec); +mutex_unlock (&spec->pcm_lock); } static void jack_callback(struct hda_codec *codec,
@@ -1628,21 +1630,23 @@ static void sync_eld_via_acomp(struct hda_codec *codec,static bool hdmi_present_sense (struct hdmi_spec_per_pin *per_pin,int repoll) {struct hda_codec *codec = per_pin->codec; -struct hdmi_spec *spec = codec->spec;int ret;/* no temporary power up/down needed for component notifier */ -if (!codec_has_acomp (codec)) -snd_hda_power_up_pm (codec); +if (!codec_has_acomp (codec)) { + ret =snd_hda_power_up_pm (codec); +if (ret <0 &&pm_runtime_suspended (hda_codec_dev (codec))) { +snd_hda_power_down_pm (codec); +return false; + } + } -mutex_lock (&spec->pcm_lock);if (codec_has_acomp (codec)) {sync_eld_via_acomp (codec, per_pin); ret = false;/* don't call snd_hda_jack_report_sync() */ }else { ret =hdmi_present_sense_via_verbs (per_pin, repoll); } -mutex_unlock (&spec->pcm_lock);if (!codec_has_acomp (codec))snd_hda_power_down_pm (codec);
@@ -1654,12 +1658,16 @@ static void hdmi_repoll_eld(struct work_struct *work) {struct hdmi_spec_per_pin *per_pin = container_of(to_delayed_work(work), struct hdmi_spec_per_pin, work); +struct hda_codec *codec = per_pin->codec; +struct hdmi_spec *spec = codec->spec;if (per_pin->repoll_count++ >6 ) per_pin->repoll_count =0 ; +mutex_lock (&spec->pcm_lock);if (hdmi_present_sense (per_pin, per_pin->repoll_count))snd_hda_jack_report_sync (per_pin->codec); +mutex_unlock (&spec->pcm_lock); } static void intel_haswell_fixup_connect_list(struct hda_codec *codec,
Signature · 1 line
2.17.1