Commit e46f1377 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Takashi Iwai
Browse files

ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. 



Now that we can use -EPROBE_DEFER, it's no longer required to spin off
the snd_hdac_i915_init into a workqueue. It's likely the whole workqueue
can be destroyed, but I don't have the means to test this.

Removing the workqueue would simplify init even further, but is left
as exercise for the reviewer.

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20231009115437.99976-12-maarten.lankhorst@linux.intel.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 65cbbfa4

sound/soc/intel/skylake/skl.c

+9 −22
Original line number Diff line number Diff line
@@ -783,23 +783,6 @@ static void skl_codec_create(struct hdac_bus *bus) 
	}

}



static int skl_i915_init(struct hdac_bus *bus)

{

	int err;



	/*

	 * The HDMI codec is in GPU so we need to ensure that it is powered

	 * up and ready for probe

	 */

	err = snd_hdac_i915_init(bus, true);

	if (err < 0)

		return err;



	snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true);



	return 0;

}



static void skl_probe_work(struct work_struct *work)

{

	struct skl_dev *skl = container_of(work, struct skl_dev, probe_work);
@@ -807,11 +790,8 @@ static void skl_probe_work(struct work_struct *work) 
	struct hdac_ext_link *hlink;

	int err;



	if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {

		err = skl_i915_init(bus);

		if (err < 0)

			return;

	}

	if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))

		snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true);



	skl_init_pci(skl);

	skl_dum_set(bus);
@@ -1075,10 +1055,17 @@ static int skl_probe(struct pci_dev *pci, 
		goto out_dsp_free;

	}



	if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) {

		err = snd_hdac_i915_init(bus, false);

		if (err < 0)

			goto out_dmic_unregister;

	}

	schedule_work(&skl->probe_work);



	return 0;



out_dmic_unregister:

	skl_dmic_device_unregister(skl);

out_dsp_free:

	skl_free_dsp(skl);

out_clk_free: