From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: sound-open-firmware@alsa-project.org,
linux-kernel@vger.kernel.org,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Peter Ujfalusi <peter.ujfalusi@linux.intel.com>,
Bard Liao <yung-chuan.liao@linux.intel.com>,
Ranjani Sridharan <ranjani.sridharan@linux.intel.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Daniel Baluta <daniel.baluta@nxp.com>
Subject: [PATCH 0/7] sound: Use -EPROBE_DEFER instead of i915 module loading.
Date: Tue, 18 Jul 2023 10:45:15 +0200 [thread overview]
Message-ID: <20230718084522.116952-1-maarten.lankhorst@linux.intel.com> (raw)
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.
I suspect the avs and skylake drivers used snd_hdac_i915_init purely for the
modprobe, but I don't have the hardware to test if it can be safely removed.
It can still be done easily in a followup patch to simplify probing.
Maarten Lankhorst (7):
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.
ASoC: Intel: Skylake: Move snd_hdac_i915_init to before probe_work.
ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work.
ASoC: SOF: Intel: Remove deferred probe for SOF
ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Cc: Bard Liao <yung-chuan.liao@linux.intel.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Daniel Baluta <daniel.baluta@nxp.com>
Cc: alsa-devel@alsa-project.org
Cc: linux-kernel@vger.kernel.org
Cc: sound-open-firmware@alsa-project.org
sound/hda/hdac_i915.c | 15 +++------
sound/pci/hda/hda_intel.c | 58 +++++++++++++++++++----------------
sound/soc/intel/avs/core.c | 13 +++++---
sound/soc/intel/skylake/skl.c | 31 ++++++-------------
sound/soc/sof/Kconfig | 19 ------------
sound/soc/sof/core.c | 38 ++---------------------
sound/soc/sof/intel/Kconfig | 1 -
sound/soc/sof/intel/hda.c | 32 +++++++++++--------
sound/soc/sof/sof-pci-dev.c | 3 +-
sound/soc/sof/sof-priv.h | 5 ---
10 files changed, 75 insertions(+), 140 deletions(-)
--
2.39.2
next reply other threads:[~2023-07-18 10:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 8:45 Maarten Lankhorst [this message]
2023-07-18 8:45 ` [PATCH 1/7] ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init Maarten Lankhorst
2023-07-18 8:45 ` [PATCH 2/7] ALSA: hda/i915: Allow xe as match for i915_component_master_match Maarten Lankhorst
2023-07-18 8:45 ` [PATCH 3/7] ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work Maarten Lankhorst
2023-07-18 14:11 ` Mark Brown
2023-07-19 15:26 ` Cezary Rojewski
2023-07-19 15:31 ` Takashi Iwai
2023-07-19 15:54 ` Maarten Lankhorst
2023-07-18 8:45 ` [PATCH 4/7] ASoC: Intel: Skylake: " Maarten Lankhorst
2023-07-18 14:12 ` Mark Brown
2023-07-18 8:45 ` [PATCH 5/7] ALSA: hda/intel: " Maarten Lankhorst
2023-07-18 9:57 ` Takashi Iwai
2023-07-18 11:57 ` [v2 PATCH 1/2] ALSA: hda/intel: Fix error handling in azx_probe() Maarten Lankhorst
2023-07-18 12:17 ` Takashi Iwai
2023-07-18 11:58 ` [v2 PATCH 2/2] ALSA: hda/intel: Move snd_hdac_i915_init to before probe_work Maarten Lankhorst
2023-07-18 8:45 ` [PATCH 6/7] ASoC: SOF: Intel: Remove deferred probe for SOF Maarten Lankhorst
2023-07-18 14:13 ` Mark Brown
2023-07-18 17:04 ` Kai Vehmanen
2023-07-19 6:01 ` Takashi Iwai
2023-07-19 9:48 ` Maarten Lankhorst
2023-07-19 11:06 ` Takashi Iwai
2023-07-19 12:13 ` [PATCH] " Maarten Lankhorst
2023-07-19 12:39 ` Mark Brown
2023-07-19 15:59 ` Maarten Lankhorst
2023-07-19 12:47 ` Takashi Iwai
2023-07-19 13:32 ` [PATCH 6/7] " Kai Vehmanen
2023-07-18 8:45 ` [PATCH 7/7] ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init Maarten Lankhorst
2023-07-18 9:50 ` [PATCH 0/7] sound: Use -EPROBE_DEFER instead of i915 module loading Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230718084522.116952-1-maarten.lankhorst@linux.intel.com \
--to=maarten.lankhorst@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=daniel.baluta@nxp.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=ranjani.sridharan@linux.intel.com \
--cc=sound-open-firmware@alsa-project.org \
--cc=tiwai@suse.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox