Unverified Commit 332ccf00 authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: hdac_hdmi: Offload dapm update at jack detection 



hdac_hdmi_present_sense() calls the audio component to get ELD update,
then it reports the jack status change and updates DAPM graph
accordingly.  This works when it's called from the normal code paths.

However, it may lead to a dead lock when it's called from the audio
component notifier.  Namely, the DAPM update involves with the runtime
PM, and it eventually calls again the audio component get_power()
ops.  Since i915 driver already takes a mutex around the audio
component ops calls, we'll eventually get the mutex doubly.

As a workaround, in this patch, only the jack state is updated in the
code path from hdac_hdmi_eld_notify_cb(), and the DAPM update is
deferred to a work so that it's processed in another context.

Reported-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20190809151531.24359-1-tiwai@suse.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 804cbf4b

sound/soc/codecs/hdac_hdmi.c

+48 −9
Original line number Diff line number Diff line
@@ -88,8 +88,10 @@ struct hdac_hdmi_port { 
	hda_nid_t mux_nids[HDA_MAX_CONNECTIONS];

	struct hdac_hdmi_eld eld;

	const char *jack_pin;

	bool is_connect;

	struct snd_soc_dapm_context *dapm;

	const char *output_pin;

	struct work_struct dapm_work;

};



struct hdac_hdmi_pcm {
@@ -163,11 +165,7 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, 
{

	struct hdac_device *hdev = port->pin->hdev;



	if (is_connect)

		snd_soc_dapm_enable_pin(port->dapm, port->jack_pin);

	else

		snd_soc_dapm_disable_pin(port->dapm, port->jack_pin);



	port->is_connect = is_connect;

	if (is_connect) {

		/*

		 * Report Jack connect event when a device is connected
@@ -193,10 +191,32 @@ static void hdac_hdmi_jack_report(struct hdac_hdmi_pcm *pcm, 
		if (pcm->jack_event > 0)

			pcm->jack_event--;

	}

}



static void hdac_hdmi_port_dapm_update(struct hdac_hdmi_port *port)

{

	if (port->is_connect)

		snd_soc_dapm_enable_pin(port->dapm, port->jack_pin);

	else

		snd_soc_dapm_disable_pin(port->dapm, port->jack_pin);

	snd_soc_dapm_sync(port->dapm);

}



static void hdac_hdmi_jack_dapm_work(struct work_struct *work)

{

	struct hdac_hdmi_port *port;



	port = container_of(work, struct hdac_hdmi_port, dapm_work);

	hdac_hdmi_port_dapm_update(port);

}



static void hdac_hdmi_jack_report_sync(struct hdac_hdmi_pcm *pcm,

		struct hdac_hdmi_port *port, bool is_connect)

{

	hdac_hdmi_jack_report(pcm, port, is_connect);

	hdac_hdmi_port_dapm_update(port);

}



/* MST supported verbs */

/*

 * Get the no devices that can be connected to a port on the Pin widget.
@@ -873,7 +893,7 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol, 
		list_for_each_entry_safe(p, p_next, &pcm->port_list, head) {

			if (p == port && p->id == port->id &&

					p->pin == port->pin) {

				hdac_hdmi_jack_report(pcm, port, false);

				hdac_hdmi_jack_report_sync(pcm, port, false);

				list_del(&p->head);

			}

		}
@@ -887,7 +907,7 @@ static int hdac_hdmi_set_pin_port_mux(struct snd_kcontrol *kcontrol, 
		if (!strcmp(cvt_name, pcm->cvt->name)) {

			list_add_tail(&port->head, &pcm->port_list);

			if (port->eld.monitor_present && port->eld.eld_valid) {

				hdac_hdmi_jack_report(pcm, port, true);

				hdac_hdmi_jack_report_sync(pcm, port, true);

				mutex_unlock(&hdmi->pin_mutex);

				return ret;

			}
@@ -1250,16 +1270,20 @@ static void hdac_hdmi_present_sense(struct hdac_hdmi_pin *pin, 
		 * report jack here. It will be done in usermode mux

		 * control select.

		 */

		if (pcm)

		if (pcm) {

			hdac_hdmi_jack_report(pcm, port, false);

			schedule_work(&port->dapm_work);

		}



		mutex_unlock(&hdmi->pin_mutex);

		return;

	}



	if (port->eld.monitor_present && port->eld.eld_valid) {

		if (pcm)

		if (pcm) {

			hdac_hdmi_jack_report(pcm, port, true);

			schedule_work(&port->dapm_work);

		}



		print_hex_dump_debug("ELD: ", DUMP_PREFIX_OFFSET, 16, 1,

			  port->eld.eld_buffer, port->eld.eld_size, false);
@@ -1288,6 +1312,7 @@ static int hdac_hdmi_add_ports(struct hdac_device *hdev, 
	for (i = 0; i < max_ports; i++) {

		ports[i].id = i;

		ports[i].pin = pin;

		INIT_WORK(&ports[i].dapm_work, hdac_hdmi_jack_dapm_work);

	}

	pin->ports = ports;

	pin->num_ports = max_ports;
@@ -2052,8 +2077,20 @@ static int hdac_hdmi_dev_probe(struct hdac_device *hdev) 
	return ret;

}



static void clear_dapm_works(struct hdac_device *hdev)

{

	struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev);

	struct hdac_hdmi_pin *pin;

	int i;



	list_for_each_entry(pin, &hdmi->pin_list, head)

		for (i = 0; i < pin->num_ports; i++)

			cancel_work_sync(&pin->ports[i].dapm_work);

}



static int hdac_hdmi_dev_remove(struct hdac_device *hdev)

{

	clear_dapm_works(hdev);

	snd_hdac_display_power(hdev->bus, hdev->addr, false);



	return 0;
@@ -2072,6 +2109,8 @@ 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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE