| Message ID | 20241023211834.3370346-2-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [topic/core-for-CI,1/2] Revert "HAX suspend: Disable S3/S4 for fi-bdw-samus" | expand |
On Wed, 23 Oct 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote: > This reverts commit 852510ccd334063bec2c2c3e5a61a071599ac015. > > This should be solved already since commit e6d0c13e9f46 ("ALSA: hda: > i915: Remove extra argument from snd_hdac_i915_init"). > > We can try to drop it and see if anything explodes on dg1 land. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> > --- > sound/hda/hdac_i915.c | 23 ----------------------- > sound/pci/hda/hda_intel.c | 3 +++ > 2 files changed, 3 insertions(+), 23 deletions(-) > > diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c > index a214636ed9757..e9425213320ea 100644 > --- a/sound/hda/hdac_i915.c > +++ b/sound/hda/hdac_i915.c > @@ -170,26 +170,6 @@ 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 > @@ -210,9 +190,6 @@ 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)); > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c > index 282e87cc2166b..b4540c5cd2a6f 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -2143,6 +2143,9 @@ 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 */
diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index a214636ed9757..e9425213320ea 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -170,26 +170,6 @@ 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 @@ -210,9 +190,6 @@ 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)); diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 282e87cc2166b..b4540c5cd2a6f 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2143,6 +2143,9 @@ 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 */
This reverts commit 852510ccd334063bec2c2c3e5a61a071599ac015. This should be solved already since commit e6d0c13e9f46 ("ALSA: hda: i915: Remove extra argument from snd_hdac_i915_init"). We can try to drop it and see if anything explodes on dg1 land. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- sound/hda/hdac_i915.c | 23 ----------------------- sound/pci/hda/hda_intel.c | 3 +++ 2 files changed, 3 insertions(+), 23 deletions(-)