Hi Maarteen, On 09/10/2023 14:54, Maarten Lankhorst wrote: > Explicitly loading i915 becomes a problem when upstreaming the new intel driver > for Tiger Lake and higher graphics (xe). By loading i915, it doesn't wait for > driver load of xe, and will fail completely before it loads. > > -EPROBE_DEFER has to be returned before any device is created in probe(), > otherwise the removal of the device will cause EPROBE_DEFER to try again > in an infinite loop. > > The conversion is done in gradual steps. First I add an argument to > snd_hdac_i915_init to allow for -EPROBE_DEFER so I can convert each driver > separately. Then I convert each driver to move snd_hdac_i915_init out of the > workqueue. Finally I drop the ability to choose modprobe behavior after the > last user is converted. > > Compared to previous version, I added the patch > "ASoC: SOF: Intel: Fix error handling in hda_init()" Thank you for the updates. to all: Reviewed-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx> and for sound/soc/sof/ : Acked-by: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx> > Cc: Jaroslav Kysela <perex@xxxxxxxx> > Cc: Takashi Iwai <tiwai@xxxxxxxx> > Cc: Cezary Rojewski <cezary.rojewski@xxxxxxxxx> > Cc: Pierre-Louis Bossart <pierre-louis.bossart@xxxxxxxxxxxxxxx> > Cc: Liam Girdwood <liam.r.girdwood@xxxxxxxxxxxxxxx> > Cc: Peter Ujfalusi <peter.ujfalusi@xxxxxxxxxxxxxxx> > Cc: Bard Liao <yung-chuan.liao@xxxxxxxxxxxxxxx> > Cc: Ranjani Sridharan <ranjani.sridharan@xxxxxxxxxxxxxxx> > Cc: Kai Vehmanen <kai.vehmanen@xxxxxxxxxxxxxxx> > Cc: Mark Brown <broonie@xxxxxxxxxx> > Cc: Daniel Baluta <daniel.baluta@xxxxxxx> > Cc: alsa-devel@xxxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > Cc: sound-open-firmware@xxxxxxxxxxxxxxxx > > Maarten Lankhorst (11): > ASoC: SOF: core: Ensure sof_ops_free() is still called when probe > never ran. > ASoC: SOF: Intel: Fix error handling in hda_init() > ALSA: hda: Intel: Fix error handling in azx_probe() > ALSA: hda: i915: Allow override of gpu binding. > ALSA: hda: i915: Add an allow_modprobe argument to snd_hdac_i915_init > ALSA: hda: i915: Allow xe as match for i915_component_master_match > ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work. > ALSA: hda: Intel: Move snd_hdac_i915_init to before probe_work. > ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work. > ASoC: SOF: Intel: Move binding to display driver outside of deferred > probe > ALSA: hda: i915: Remove extra argument from snd_hdac_i915_init > > Pierre-Louis Bossart (2): > ASoC: SOF: core: Add probe_early and remove_late callbacks > ASoC: SOF: Intel: hda: start splitting the probe > > sound/hda/hdac_i915.c | 24 ++++++----- > sound/pci/hda/hda_intel.c | 60 ++++++++++++++-------------- > sound/soc/intel/avs/core.c | 13 ++++-- > sound/soc/intel/skylake/skl.c | 31 +++++--------- > sound/soc/sof/core.c | 17 +++++++- > sound/soc/sof/intel/hda-common-ops.c | 2 + > sound/soc/sof/intel/hda.c | 46 +++++++++++++-------- > sound/soc/sof/intel/hda.h | 2 + > sound/soc/sof/ops.h | 16 ++++++++ > sound/soc/sof/sof-priv.h | 2 + > 10 files changed, 129 insertions(+), 84 deletions(-) > -- Péter
