Message ID | 20230718084522.116952-3-maarten.lankhorst@linux.intel.com |
---|---|
State | Superseded |
Headers | show |
Series | None | expand |
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 12f93008ad361..c88f251388e80 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -108,7 +108,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;
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(-)