diff options
| author |  Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
| 2023-10-09 13:54:32 +0200 |
|---|---|---|
| committer |  Takashi Iwai <tiwai@suse.de>
| 2023-10-19 14:55:34 +0200 |
| commit | e8e3f8694ef521cbda0d5304d86da4cc3fec13ca (patch) | |
| tree | b7db032d169e629ceb501a6c85c14b1671995187 /sound/hda/hdac_i915.c | |
| parent | ALSA: hda: i915: Add an allow_modprobe argument to snd_hdac_i915_init (diff) | |
| download | linux-e8e3f8694ef521cbda0d5304d86da4cc3fec13ca.tar.gz linux-e8e3f8694ef521cbda0d5304d86da4cc3fec13ca.tar.bz2 linux-e8e3f8694ef521cbda0d5304d86da4cc3fec13ca.zip | |
ALSA: hda: i915: Allow xe as match for i915_component_master_match
Xe is a new driver for intel GPU's that shares the sound related code
with i915.
The modprobe mechanism is being replaced by the -EPROBE_DEFER mechanism,
so we don't need to add a modprobe xe call. Adding this would have
required a telepathy module to correctly guess whether to load i915 or
xe.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231009115437.99976-9-maarten.lankhorst@linux.intel.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/hdac_i915.c')
| -rw-r--r-- | sound/hda/hdac_i915.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index ffa35d7a367c..0765e5350e7b 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; |