Skip to content
Snippets Groups Projects
Commit 90fbd685 authored by Chris Wilson's avatar Chris Wilson :thinking: Committed by Lucas De Marchi
Browse files

HAX sound: Disable probing snd_hda with DG1

Audio component in i915 is not hooked up yet causing long timeouts and
angry abortive CI.

References: https://gitlab.freedesktop.org/drm/intel/-/issues/8045


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 04ec48ab
No related branches found
No related tags found
No related merge requests found
......@@ -144,6 +144,26 @@ static int i915_gfx_present(struct pci_dev *hdac_pci)
return false;
}
static bool dg1_gfx_present(void)
{
static const struct pci_device_id ids[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4905),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16 },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4906),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16 },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4907),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16 },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4908),
.class = PCI_BASE_CLASS_DISPLAY << 16,
.class_mask = 0xff << 16 },
{}
};
return pci_dev_present(ids);
}
/**
* snd_hdac_i915_init - Initialize i915 audio component
* @bus: HDA core bus
......@@ -164,6 +184,9 @@ int snd_hdac_i915_init(struct hdac_bus *bus)
if (!i915_gfx_present(to_pci_dev(bus->dev)))
return -ENODEV;
if (dg1_gfx_present())
return -ENODEV;
err = snd_hdac_acomp_init(bus, NULL,
i915_component_master_match,
sizeof(struct i915_audio_component) - sizeof(*acomp));
......
......@@ -2144,9 +2144,6 @@ static int azx_probe(struct pci_dev *pci,
* codecs can be on the same link.
*/
if (HDA_CONTROLLER_IN_GPU(pci)) {
dev_err_probe(card->dev, err,
"HSW/BDW HD-audio HDMI/DP requires binding with gfx driver\n");
goto out_free;
} else {
/* don't bother any longer */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment