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 v2 4/9] ALSA: hda/i915: Allow xe as match for i915_component_master_match
Date: Wed, 19 Jul 2023 18:41:36 +0200 [thread overview]
Message-ID: <20230719164141.228073-5-maarten.lankhorst@linux.intel.com> (raw)
In-Reply-To: <20230719164141.228073-1-maarten.lankhorst@linux.intel.com>
xe is a new driver for intel GPU's that shares the sound related code
with i915.
Don't allow it to be modprobed though; the module is not upstream yet
and we should exclusively use the EPROBE_DEFER mechanism.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
---
sound/hda/hdac_i915.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c
index 961fcd3397f40..12c1f8d93499f 100644
--- a/sound/hda/hdac_i915.c
+++ b/sound/hda/hdac_i915.c
@@ -115,7 +115,8 @@ static int i915_component_master_match(struct device *dev, int subcomponent,
hdac_pci = to_pci_dev(bus->dev);
i915_pci = to_pci_dev(dev);
- if (!strcmp(dev->driver->name, "i915") &&
+ if ((!strcmp(dev->driver->name, "i915") ||
+ !strcmp(dev->driver->name, "xe")) &&
subcomponent == I915_COMPONENT_AUDIO &&
connectivity_check(i915_pci, hdac_pci))
return 1;
--
2.39.2
next prev parent reply other threads:[~2023-07-19 16:42 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 16:41 [PATCH v2 0/9] sound: Use -EPROBE_DEFER instead of i915 module loading Maarten Lankhorst
2023-07-19 16:41 ` [PATCH v2 1/9] ALSA: hda/intel: Fix error handling in azx_probe() Maarten Lankhorst
2023-07-21 11:34 ` Péter Ujfalusi
2023-07-24 10:15 ` Pierre-Louis Bossart
2023-07-19 16:41 ` [PATCH v2 2/9] ALSA: hda/i915: Allow override of gpu binding Maarten Lankhorst
2023-07-21 12:19 ` Péter Ujfalusi
2023-07-24 10:25 ` Pierre-Louis Bossart
2023-07-25 9:54 ` Maarten Lankhorst
2023-07-25 11:52 ` Pierre-Louis Bossart
2023-07-25 12:19 ` Takashi Iwai
2023-07-19 16:41 ` [PATCH v2 3/9] ALSA: hda/i915: Add an allow_modprobe argument to snd_hdac_i915_init Maarten Lankhorst
2023-07-21 11:32 ` Péter Ujfalusi
2023-07-19 16:41 ` Maarten Lankhorst [this message]
2023-07-21 12:20 ` [PATCH v2 4/9] ALSA: hda/i915: Allow xe as match for i915_component_master_match Péter Ujfalusi
2023-07-24 10:28 ` Pierre-Louis Bossart
2023-07-25 10:04 ` Maarten Lankhorst
2023-07-19 16:41 ` [PATCH v2 5/9] ASoC: Intel: avs: Move snd_hdac_i915_init to before probe_work Maarten Lankhorst
2023-07-19 16:41 ` [PATCH v2 6/9] ASoC: Intel: Skylake: " Maarten Lankhorst
2023-07-19 16:41 ` [PATCH v2 7/9] ALSA: hda/intel: " Maarten Lankhorst
2023-07-24 10:58 ` Pierre-Louis Bossart
2023-07-25 10:13 ` Maarten Lankhorst
2023-07-19 16:41 ` [PATCH v2 8/9] ASoC: SOF: Intel: Remove deferred probe for SOF Maarten Lankhorst
2023-07-21 12:17 ` Péter Ujfalusi
2023-07-24 11:32 ` Pierre-Louis Bossart
2023-07-25 10:29 ` Maarten Lankhorst
2023-07-25 10:37 ` Takashi Iwai
2023-07-19 16:41 ` [PATCH v2 9/9] ALSA: hda/i915: Remove extra argument from snd_hdac_i915_init Maarten Lankhorst
2023-07-21 10:06 ` [PATCH v2 0/9] sound: Use -EPROBE_DEFER instead of i915 module loading Kai Vehmanen
2023-07-21 12:19 ` Péter Ujfalusi
2023-07-31 15:51 ` Takashi Iwai
2023-07-31 16:37 ` Maarten Lankhorst
2023-07-31 19:32 ` Takashi Iwai
2023-08-01 7:27 ` Maarten Lankhorst
2023-08-01 16:32 ` Pierre-Louis Bossart
2023-08-04 10:47 ` [PATCH] ASoC: SOF: Intel: Move binding to display driver outside of deferred probe Maarten Lankhorst
2023-08-04 11:59 ` Mark Brown
2023-08-04 14:31 ` Maarten Lankhorst
2023-08-04 14:34 ` Mark Brown
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=20230719164141.228073-5-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
Powered by JetHome