Skip to content

Commit 0aeb011

Browse files
ujfalusibardliao
authored andcommitted
ALSA: hda/i915: Add flag to hdac_bus to disable device link for display audio
i915_no_device_link can be set by audio stacks where there is no direct hardware dependency exist between display and HDA. The flag will be passed to acomp->no_device_link for the display stack to skip the creation of the display link if it is set. By default the link creation will remain to ensure that it is skipped only when it is possible by the architecture. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent aa07f95 commit 0aeb011

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

include/sound/hdaudio.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,7 @@ struct hdac_bus {
352352
bool not_use_interrupts:1; /* prohibiting the RIRB IRQ */
353353
bool access_sdnctl_in_dword:1; /* accessing the sdnctl register by dword */
354354
bool use_pio_for_commands:1; /* Use PIO instead of CORB for commands */
355+
bool i915_no_device_link:1; /* Do not add device link for i915 HDMI audio */
355356

356357
int poll_count;
357358

sound/hda/hdac_i915.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,13 @@ static int i915_component_master_match(struct device *dev, int subcomponent,
118118
if ((!strcmp(dev->driver->name, "i915") ||
119119
!strcmp(dev->driver->name, "xe")) &&
120120
subcomponent == I915_COMPONENT_AUDIO &&
121-
connectivity_check(i915_pci, hdac_pci))
121+
connectivity_check(i915_pci, hdac_pci)) {
122+
struct i915_audio_component *acomp = bus->audio_component;
123+
124+
acomp->no_device_link = bus->i915_no_device_link;
125+
122126
return 1;
127+
}
123128

124129
return 0;
125130
}

0 commit comments

Comments
 (0)