2023-03-07 21:41:05

by Bjorn Helgaas

Subject: [PATCH] ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU()

From: Bjorn Helgaas <[email protected]>

CONTROLLER_IN_GPU() is clearly intended to match only Intel devices, but
previously it checked only the PCI Device ID, not the Vendor ID, so it
could match devices from other vendors that happened to use the same Device
ID.

Update CONTROLLER_IN_GPU() so it matches only Intel devices.

Fixes: 535115b5ff51 ("ALSA: hda - Abort the probe without i915 binding for HSW/B")
Signed-off-by: Bjorn Helgaas <[email protected]>
---
sound/pci/hda/hda_intel.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 81c4a45254ff..77a592f21947 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -328,14 +328,15 @@ enum {
#define needs_eld_notify_link(chip) false
#endif

-#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \
+#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) && \
+ (((pci)->device == 0x0a0c) || \
((pci)->device == 0x0c0c) || \
((pci)->device == 0x0d0c) || \
((pci)->device == 0x160c) || \
((pci)->device == 0x490d) || \
((pci)->device == 0x4f90) || \
((pci)->device == 0x4f91) || \
- ((pci)->device == 0x4f92))
+ ((pci)->device == 0x4f92)))

#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)

--
2.25.1

2023-03-08 05:40:15

by Takashi Iwai

Subject: Re: [PATCH] ALSA: hda: Match only Intel devices with CONTROLLER_IN_GPU()

On Tue, 07 Mar 2023 22:40:54 +0100,
Bjorn Helgaas wrote:
>
> From: Bjorn Helgaas <[email protected]>
>
> CONTROLLER_IN_GPU() is clearly intended to match only Intel devices, but
> previously it checked only the PCI Device ID, not the Vendor ID, so it
> could match devices from other vendors that happened to use the same Device
> ID.
>
> Update CONTROLLER_IN_GPU() so it matches only Intel devices.
>
> Fixes: 535115b5ff51 ("ALSA: hda - Abort the probe without i915 binding for HSW/B")
> Signed-off-by: Bjorn Helgaas <[email protected]>

Thanks, applied now.


Takashi