Skip to content

Commit 5fc4e91

Browse files
kv2019iplbossart
authored andcommitted
ALSA: hda/i915: extend connectivity check to cover Intel ARL
Expand the HDA/I915 connectivity check to correctly handle the PCI topology used in some Intel Arrow Lake products. Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Tested-by: T, Arun <arun.t@intel.com>
1 parent 0079b05 commit 5fc4e91

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

sound/hda/hdac_i915.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,20 @@ static bool connectivity_check(struct pci_dev *i915, struct pci_dev *hdac)
8080
if (bus_a == bus_b)
8181
return true;
8282

83-
/*
84-
* on i915 discrete GPUs with embedded HDA audio, the two
85-
* devices are connected via 2nd level PCI bridge
86-
*/
8783
bus_a = bus_a->parent;
8884
bus_b = bus_b->parent;
85+
86+
/* connected via parent bus (may be NULL!) */
87+
if (bus_a == bus_b)
88+
return true;
89+
8990
if (!bus_a || !bus_b)
9091
return false;
92+
93+
/*
94+
* on i915 discrete GPUs with embedded HDA audio, the two
95+
* devices are connected via 2nd level PCI bridge
96+
*/
9197
bus_a = bus_a->parent;
9298
bus_b = bus_b->parent;
9399
if (bus_a && bus_a == bus_b)

0 commit comments

Comments
 (0)